Migrate the rest of the "global" prefs.

chrome/browser/net/chrome_url_request_context.cc

Index: chrome/browser/net/chrome_url_request_context.cc
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 80c0c8a6abae96e2d75a9a5e161ba09a233fbbff..7aad47c8b3d741cbe4599e63836e22315d89bc45 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -254,9 +254,9 @@ void ChromeURLRequestContextGetter::Observe(
               &ChromeURLRequestContextGetter::OnAcceptLanguageChange,
               this,
               accept_language));
-    } else if (*pref_name_in == prefs::kGlobalDefaultCharset) {
+    } else if (*pref_name_in == prefs::kDefaultCharset) {
       std::string default_charset =
-          prefs->GetString(prefs::kGlobalDefaultCharset);
+          prefs->GetString(prefs::kDefaultCharset);

[Peter Kasting, 2012/05/21 21:37:20]

Nit: Will fit on one line

[falken, 2012/05/22 02:24:21]

Done.

       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
@@ -283,7 +283,7 @@ void ChromeURLRequestContextGetter::RegisterPrefsObserver(Profile* profile) {
 
   registrar_.Init(profile->GetPrefs());
   registrar_.Add(prefs::kAcceptLanguages, this);
-  registrar_.Add(prefs::kGlobalDefaultCharset, this);
+  registrar_.Add(prefs::kDefaultCharset, this);
   registrar_.Add(prefs::kClearSiteDataOnExit, this);
 }