Migrate the rest of the "global" prefs.

chrome/browser/ui/toolbar/encoding_menu_controller.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
@@ skipping 66 matching lines @@
 }
 
 bool EncodingMenuController::IsItemChecked(
     Profile* browser_profile,
     const std::string& current_tab_encoding,
     int item_id) {
   if (!DoesCommandBelongToEncodingMenu(item_id))
     return false;
 
   std::string encoding = current_tab_encoding;
-  if (encoding.empty()) {
-    encoding =
-        browser_profile->GetPrefs()->GetString(prefs::kGlobalDefaultCharset);
-  }
+  if (encoding.empty())
+    encoding = browser_profile->GetPrefs()->GetString(prefs::kDefaultCharset);
 
   if (item_id == IDC_ENCODING_AUTO_DETECT) {
     return browser_profile->GetPrefs()->GetBoolean(
         prefs::kWebKitUsesUniversalDetector);
   }
 
   if (!encoding.empty()) {
     return encoding ==
         CharacterEncoding::GetCanonicalEncodingNameByCommandId(item_id);
   }
@@ skipping 31 matching lines @@
   for (it = encodings->begin(); it != encodings->end(); ++it) {
     if (it->encoding_id) {
       string16 encoding = it->encoding_display_name;
       base::i18n::AdjustStringForLocaleDirection(&encoding);
       menu_items->push_back(EncodingMenuItem(it->encoding_id, encoding));
     } else {
       menu_items->push_back(separator);
     }
   }
 }