Removing PrefObserver usage, batch 4.

chrome/browser/extensions/api/preference/preference_api.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/extensions/api/preference/preference_api.h"
 
 #include <map>
 #include <utility>
 
 #include "base/memory/singleton.h"
@@ skipping 228 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PrefMapping);
 };
 
 }  // namespace
 
 PreferenceEventRouter::PreferenceEventRouter(Profile* profile)
     : profile_(profile) {
   registrar_.Init(profile_->GetPrefs());
   incognito_registrar_.Init(profile_->GetOffTheRecordPrefs());
   for (size_t i = 0; i < arraysize(kPrefMapping); ++i) {
-    registrar_.Add(kPrefMapping[i].browser_pref, this);
-    incognito_registrar_.Add(kPrefMapping[i].browser_pref, this);
+    registrar_.Add(kPrefMapping[i].browser_pref,
+                   base::Bind(&PreferenceEventRouter::OnPrefChanged,
+                              base::Unretained(this),
+                              registrar_.prefs()));
+    incognito_registrar_.Add(kPrefMapping[i].browser_pref,
+                             base::Bind(&PreferenceEventRouter::OnPrefChanged,
+                                        base::Unretained(this),
+                                        incognito_registrar_.prefs()));
   }
 }
 
 PreferenceEventRouter::~PreferenceEventRouter() { }
 
-void PreferenceEventRouter::OnPreferenceChanged(PrefServiceBase* service,
-                                                const std::string& pref_name) {
-  OnPrefChanged(service, pref_name);
-}
-
 void PreferenceEventRouter::OnPrefChanged(PrefServiceBase* pref_service,
                                           const std::string& browser_pref) {
   bool incognito = (pref_service != profile_->GetPrefs());
 
   std::string event_name;
   APIPermission::ID permission = APIPermission::kInvalid;
   bool rv = PrefMapping::GetInstance()->FindEventForBrowserPref(
       browser_pref, &event_name, &permission);
   DCHECK(rv);
 
@@ skipping 235 matching lines @@
   if (!ValidateBrowserPref(pref_key, &browser_pref))
     return false;
 
   extensions::ExtensionPrefs* prefs =
       profile_->GetExtensionService()->extension_prefs();
   prefs->RemoveExtensionControlledPref(extension_id(), browser_pref, scope);
   return true;
 }
 
 }  // namespace extensions