Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/browser_process_impl.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/browser_process_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 592 matching lines @@
 }
 
 safe_browsing::ClientSideDetectionService*
     BrowserProcessImpl::safe_browsing_detection_service() {
   DCHECK(CalledOnValidThread());
   if (safe_browsing_service())
     return safe_browsing_service()->safe_browsing_detection_service();
   return NULL;
 }
 
-void BrowserProcessImpl::Observe(int type,
-                                 const content::NotificationSource& source,
-                                 const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_PREF_CHANGED) {
-    std::string* pref = content::Details<std::string>(details).ptr();
-    if (*pref == prefs::kDefaultBrowserSettingEnabled) {
-      ApplyDefaultBrowserPolicy();
-    } else if (*pref == prefs::kDisabledSchemes) {
-      ApplyDisabledSchemesPolicy();
-    } else if (*pref == prefs::kAllowCrossOriginAuthPrompt) {
-      ApplyAllowCrossOriginAuthPromptPolicy();
-    }
-  } else {
-    NOTREACHED();
+void BrowserProcessImpl::OnPreferenceChanged(PrefServiceBase* service,
+                                             const std::string& pref) {
+  if (pref == prefs::kDefaultBrowserSettingEnabled) {
+    ApplyDefaultBrowserPolicy();
+  } else if (pref == prefs::kDisabledSchemes) {
+    ApplyDisabledSchemesPolicy();
+  } else if (pref == prefs::kAllowCrossOriginAuthPrompt) {
+    ApplyAllowCrossOriginAuthPromptPolicy();
   }
 }
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 void BrowserProcessImpl::StartAutoupdateTimer() {
   autoupdate_timer_.Start(FROM_HERE,
       base::TimeDelta::FromHours(kUpdateCheckIntervalHours),
       this,
       &BrowserProcessImpl::OnAutoupdateTimer);
 }
@@ skipping 315 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)