Remove the last usages of PrefObserver outside of Prefs.

chrome/browser/extensions/extension_prefs_unittest.cc

Index: chrome/browser/extensions/extension_prefs_unittest.cc
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 87a9ba5b8f9902e9c5fd2b0b40b32143807848a6..9ddedbd19956ba7e898e98faaec7b6ffcd2772e7 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -14,7 +14,7 @@
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/browser/extensions/extension_prefs.h"
-#include "chrome/browser/prefs/pref_observer_mock.h"
+#include "chrome/browser/prefs/mock_pref_change_callback.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
@@ -1017,60 +1017,60 @@ class ExtensionPrefsNotifyWhenNeeded : public ExtensionPrefsPrepopulatedTest {
     using testing::Mock;
     using testing::StrEq;
 
-    PrefObserverMock observer;
+    MockPrefChangeCallback observer(prefs()->pref_service());
     PrefChangeRegistrar registrar;
     registrar.Init(prefs()->pref_service());
-    registrar.Add(kPref1, &observer);
+    registrar.Add(kPref1, observer.GetCallback());
 
-    PrefObserverMock incognito_observer;
+    MockPrefChangeCallback incognito_observer(prefs()->pref_service());
     scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
     PrefChangeRegistrar incognito_registrar;
     incognito_registrar.Init(incog_prefs.get());
-    incognito_registrar.Add(kPref1, &incognito_observer);
+    incognito_registrar.Add(kPref1, incognito_observer.GetCallback());
 
     // Write value and check notification.
-    EXPECT_CALL(observer, OnPreferenceChanged(_, _));
-    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_, _));
+    EXPECT_CALL(observer, OnPreferenceChanged(_));
+    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
     InstallExtControlledPref(ext1_, kPref1,
         Value::CreateStringValue("https://www.chromium.org"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
     // Write same value.
-    EXPECT_CALL(observer, OnPreferenceChanged(_, _)).Times(0);
-    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_, _)).Times(0);
+    EXPECT_CALL(observer, OnPreferenceChanged(_)).Times(0);
+    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_)).Times(0);
     InstallExtControlledPref(ext1_, kPref1,
         Value::CreateStringValue("https://www.chromium.org"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
     // Change value.
-    EXPECT_CALL(observer, OnPreferenceChanged(_, _));
-    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_, _));
+    EXPECT_CALL(observer, OnPreferenceChanged(_));
+    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
     InstallExtControlledPref(ext1_, kPref1,
         Value::CreateStringValue("chrome://newtab"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
     // Change only incognito persistent value.
-    EXPECT_CALL(observer, OnPreferenceChanged(_, _)).Times(0);
-    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_, _));
+    EXPECT_CALL(observer, OnPreferenceChanged(_)).Times(0);
+    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
     InstallExtControlledPrefIncognito(ext1_, kPref1,
         Value::CreateStringValue("chrome://newtab2"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
     // Change only incognito session-only value.
-    EXPECT_CALL(observer, OnPreferenceChanged(_, _)).Times(0);
-    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_, _));
+    EXPECT_CALL(observer, OnPreferenceChanged(_)).Times(0);
+    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
     InstallExtControlledPrefIncognito(ext1_, kPref1,
         Value::CreateStringValue("chrome://newtab3"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
     // Uninstall.
-    EXPECT_CALL(observer, OnPreferenceChanged(_, _));
-    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_, _));
+    EXPECT_CALL(observer, OnPreferenceChanged(_));
+    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
     UninstallExtension(ext1_->id());
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);