Remove the last usages of PrefObserver outside of Prefs.

chrome/browser/extensions/extension_prefs_unittest.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 "extension_prefs_unittest.h"
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #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"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/mock_notification_observer.h"
 #include "sync/api/string_ordinal.h"
 
@@ skipping 982 matching lines @@
 TEST_F(ExtensionPrefsUninstallExtension,
        ExtensionPrefsUninstallExtension) {}
 
 // Tests triggering of notifications to registered observers.
 class ExtensionPrefsNotifyWhenNeeded : public ExtensionPrefsPrepopulatedTest {
   virtual void Initialize() {
     using testing::_;
     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);
 
     registrar.Remove(kPref1);
     incognito_registrar.Remove(kPref1);
   }
   virtual void Verify() {
     std::string actual = prefs()->pref_service()->GetString(kPref1);
     EXPECT_EQ(kDefaultPref1, actual);
@@ skipping 99 matching lines @@
       EXPECT_EQ(kDefaultPref1, actual);
     }
   }
 
  private:
   int iteration_;
 };
 TEST_F(ExtensionPrefsDisableExtensions, ExtensionPrefsDisableExtensions) {}
 
 }  // namespace extensions