Migrate the rest of the "global" prefs.

chrome/browser/net/chrome_url_request_context.cc

 // 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/net/chrome_url_request_context.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 236 matching lines @@
     DCHECK(pref_name_in && prefs);
     if (*pref_name_in == prefs::kAcceptLanguages) {
       std::string accept_language =
           prefs->GetString(prefs::kAcceptLanguages);
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
               &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(
               &ChromeURLRequestContextGetter::OnDefaultCharsetChange,
               this,
               default_charset));
     } else if (*pref_name_in == prefs::kClearSiteDataOnExit) {
       bool clear_site_data =
           prefs->GetBoolean(prefs::kClearSiteDataOnExit);
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(
               &ChromeURLRequestContextGetter::OnClearSiteDataOnExitChange,
               this,
               clear_site_data));
     }
   } else {
     NOTREACHED();
   }
 }
 
 void ChromeURLRequestContextGetter::RegisterPrefsObserver(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   registrar_.Init(profile->GetPrefs());
   registrar_.Add(prefs::kAcceptLanguages, this);
-  registrar_.Add(prefs::kGlobalDefaultCharset, this);
+  registrar_.Add(prefs::kDefaultCharset, this);
   registrar_.Add(prefs::kClearSiteDataOnExit, this);
 }
 
 void ChromeURLRequestContextGetter::OnAcceptLanguageChange(
     const std::string& accept_language) {
   GetIOContext()->OnAcceptLanguageChange(accept_language);
 }
 
 void ChromeURLRequestContextGetter::OnDefaultCharsetChange(
     const std::string& default_charset) {
@@ skipping 58 matching lines @@
       net::HttpUtil::GenerateAcceptLanguageHeader(accept_language));
 }
 
 void ChromeURLRequestContext::OnDefaultCharsetChange(
     const std::string& default_charset) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   set_referrer_charset(default_charset);
   set_accept_charset(
       net::HttpUtil::GenerateAcceptCharsetHeader(default_charset));
 }