Remove content::NotificationObserver dependency from most Prefs code.

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 277 matching lines @@
           main_context, protocol_handler_interceptor.Pass()));
 }
 
 void ChromeURLRequestContextGetter::CleanupOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Unregister for pref notifications.
   DCHECK(!registrar_.IsEmpty()) << "Called more than once!";
   registrar_.RemoveAll();
 }
 
-// content::NotificationObserver implementation.
-void ChromeURLRequestContextGetter::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
+void ChromeURLRequestContextGetter::OnPreferenceChanged(
+    PrefServiceBase* prefs,
+    const std::string& pref_name_in) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (chrome::NOTIFICATION_PREF_CHANGED == type) {
-    std::string* pref_name_in = content::Details<std::string>(details).ptr();
-    PrefService* prefs = content::Source<PrefService>(source).ptr();
-    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::kDefaultCharset) {
-      std::string default_charset = prefs->GetString(prefs::kDefaultCharset);
-      BrowserThread::PostTask(
-          BrowserThread::IO, FROM_HERE,
-          base::Bind(
-              &ChromeURLRequestContextGetter::OnDefaultCharsetChange,
-              this,
-              default_charset));
-    }
-  } else {
-    NOTREACHED();
+  DCHECK(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::kDefaultCharset) {
+    std::string default_charset = prefs->GetString(prefs::kDefaultCharset);
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(
+            &ChromeURLRequestContextGetter::OnDefaultCharsetChange,
+            this,
+            default_charset));
   }
 }
 
 void ChromeURLRequestContextGetter::RegisterPrefsObserver(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   registrar_.Init(profile->GetPrefs());
   registrar_.Add(prefs::kAcceptLanguages, this);
   registrar_.Add(prefs::kDefaultCharset, this);
 }
@@ skipping 60 matching lines @@
   set_accept_language(
       net::HttpUtil::GenerateAcceptLanguageHeader(accept_language));
 }
 
 void ChromeURLRequestContext::OnDefaultCharsetChange(
     const std::string& default_charset) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   set_accept_charset(
       net::HttpUtil::GenerateAcceptCharsetHeader(default_charset));
 }