Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/protector/base_prefs_change.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/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/protector/base_prefs_change.h"
 #include "chrome/browser/protector/protected_prefs_watcher.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
@@ skipping 25 matching lines @@
 
 void BasePrefsChange::DismissOnPrefChange(const std::string& pref_name) {
   DCHECK(!pref_observer_.IsObserved(pref_name));
   pref_observer_.Add(pref_name.c_str(), this);
 }
 
 void BasePrefsChange::IgnorePrefChanges() {
   pref_observer_.RemoveAll();
 }
 
-void BasePrefsChange::Observe(int type,
-                             const content::NotificationSource& source,
-                             const content::NotificationDetails& details) {
-  DCHECK(type == chrome::NOTIFICATION_PREF_CHANGED);
-  const std::string* pref_name = content::Details<std::string>(details).ptr();
-  DCHECK(pref_name && pref_observer_.IsObserved(*pref_name));
+void BasePrefsChange::OnPreferenceChanged(PrefServiceBase* service,
+                                          const std::string& pref_name) {
+  DCHECK(pref_observer_.IsObserved(pref_name));
   // Will delete this instance.
   ProtectorServiceFactory::GetForProfile(profile())->DismissChange(this);
 }
 
 }  // namespace protector