Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/safe_browsing/safe_browsing_tab_observer.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/safe_browsing/safe_browsing_tab_observer.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 37 matching lines @@
   }
 #endif
 }
 
 SafeBrowsingTabObserver::~SafeBrowsingTabObserver() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // content::NotificationObserver overrides
 
-void SafeBrowsingTabObserver::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      Profile* profile =
-          Profile::FromBrowserContext(web_contents_->GetBrowserContext());
-      std::string* pref_name = content::Details<std::string>(details).ptr();
-      DCHECK(content::Source<PrefService>(source).ptr() ==
-             profile->GetPrefs());
-      if (*pref_name == prefs::kSafeBrowsingEnabled) {
-        UpdateSafebrowsingDetectionHost();
-      } else {
-        NOTREACHED() << "unexpected pref change notification" << *pref_name;
-      }
-      break;
-    }
-    default:
-      NOTREACHED();
+void SafeBrowsingTabObserver::OnPreferenceChanged(
+    PrefServiceBase* service,
+    const std::string& pref_name) {
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents_->GetBrowserContext());
+  DCHECK(service == profile->GetPrefs());
+  if (pref_name == prefs::kSafeBrowsingEnabled) {
+    UpdateSafebrowsingDetectionHost();
+  } else {
+    NOTREACHED() << "unexpected pref change notification" << pref_name;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Internal helpers
 
 void SafeBrowsingTabObserver::UpdateSafebrowsingDetectionHost() {
 #if defined(ENABLE_SAFE_BROWSING)
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
   bool safe_browsing = prefs->GetBoolean(prefs::kSafeBrowsingEnabled);
   if (safe_browsing &&
       g_browser_process->safe_browsing_detection_service()) {
     if (!safebrowsing_detection_host_.get()) {
       safebrowsing_detection_host_.reset(
           ClientSideDetectionHost::Create(web_contents_));
     }
   } else {
     safebrowsing_detection_host_.reset();
   }
 
   content::RenderViewHost* rvh = web_contents_->GetRenderViewHost();
   rvh->Send(new ChromeViewMsg_SetClientSidePhishingDetection(
       rvh->GetRoutingID(), safe_browsing));
 #endif
 }
 
 }  // namespace safe_browsing