Remove content::NotificationObserver dependency from most Prefs code.

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/path_service.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/scoped_temp_dir.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/scoped_user_pref_update.h"
+#include "chrome/browser/prefs/pref_observer_mock.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"
 
 using base::Time;
@@ skipping 1017 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;
 
-    content::MockNotificationObserver observer;
+    PrefObserverMock observer;
     PrefChangeRegistrar registrar;
     registrar.Init(prefs()->pref_service());
     registrar.Add(kPref1, &observer);
 
-    content::MockNotificationObserver incognito_observer;
+    PrefObserverMock incognito_observer;
     scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
     PrefChangeRegistrar incognito_registrar;
     incognito_registrar.Init(incog_prefs.get());
     incognito_registrar.Add(kPref1, &incognito_observer);
 
     // Write value and check notification.
-    EXPECT_CALL(observer, Observe(_, _, _));
-    EXPECT_CALL(incognito_observer, Observe(_, _, _));
+    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, Observe(_, _, _)).Times(0);
-    EXPECT_CALL(incognito_observer, Observe(_, _, _)).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, Observe(_, _, _));
-    EXPECT_CALL(incognito_observer, Observe(_, _, _));
+    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, Observe(_, _, _)).Times(0);
-    EXPECT_CALL(incognito_observer, Observe(_, _, _));
+    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, Observe(_, _, _)).Times(0);
-    EXPECT_CALL(incognito_observer, Observe(_, _, _));
+    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, Observe(_, _, _));
-    EXPECT_CALL(incognito_observer, Observe(_, _, _));
+    EXPECT_CALL(observer, OnPreferenceChanged(_, _));
+    EXPECT_CALL(incognito_observer, OnPreferenceChanged(_, _));
     UninstallExtension(ext1_->id());
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
     registrar.Remove(kPref1, &observer);
     incognito_registrar.Remove(kPref1, &incognito_observer);
   }
   virtual void Verify() {
     std::string actual = prefs()->pref_service()->GetString(kPref1);
     EXPECT_EQ(kDefaultPref1, actual);
@@ skipping 166 matching lines @@
     EXPECT_EQ(string16(), error16);
     EXPECT_TRUE(prefs()->UserMayModifySettings(extension_.get(), &error16));
     EXPECT_EQ(string16(), error16);
     EXPECT_FALSE(prefs()->MustRemainEnabled(extension_.get(), &error16));
     EXPECT_EQ(string16(), error16);
   }
 };
 TEST_F(ExtensionPrefsNotRequiredExtension, NotRequiredExtension) {}
 
 }  // namespace extensions