Remove the last usages of PrefObserver outside of Prefs.

chrome/browser/prefs/mock_pref_change_callback.h

 // Copyright (c) 2011 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.
 
-#ifndef CHROME_BROWSER_PREFS_PREF_OBSERVER_MOCK_H_
-#define CHROME_BROWSER_PREFS_PREF_OBSERVER_MOCK_H_
+#ifndef CHROME_BROWSER_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_
+#define CHROME_BROWSER_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_
 
 #include <string>
 
-#include "base/prefs/public/pref_observer.h"
+#include "base/prefs/public/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::Pointee;
 using testing::Property;
 using testing::Truly;
 
 // Matcher that checks whether the current value of the preference named
 // |pref_name| in |prefs| matches |value|. If |value| is NULL, the matcher
 // checks that the value is not set.
 MATCHER_P3(PrefValueMatches, prefs, pref_name, value, "") {
   const PrefServiceBase::Preference* pref =
       prefs->FindPreference(pref_name.c_str());
   if (!pref)
     return false;
 
   const Value* actual_value = pref->GetValue();
   if (!actual_value)
     return value == NULL;
   if (!value)
     return actual_value == NULL;
   return value->Equals(actual_value);
 }
 
 // A mock for testing preference notifications and easy setup of expectations.
-class PrefObserverMock : public PrefObserver {
+class MockPrefChangeCallback {
  public:
-  PrefObserverMock();
-  virtual ~PrefObserverMock();
+  MockPrefChangeCallback(PrefServiceBase* prefs);
+  virtual ~MockPrefChangeCallback();
 
-  MOCK_METHOD2(OnPreferenceChanged, void(PrefServiceBase*, const std::string&));
+  PrefChangeRegistrar::NamedChangeCallback GetCallback();
 
-  void Expect(PrefServiceBase* prefs,
-              const std::string& pref_name,
+  MOCK_METHOD1(OnPreferenceChanged, void(const std::string&));

[Mattias Nissler (ping if slow), 2012/12/04 10:10:34]

As mentioned elsewhere, you could put that declaration on the test fixture
classes that need this.

[Jói, 2012/12/04 10:55:57]

Leaving this as discussed elsewhere.

+
+  void Expect(const std::string& pref_name,
               const Value* value);
+
+ private:
+  PrefServiceBase* prefs_;
 };
 
-#endif  // CHROME_BROWSER_PREFS_PREF_OBSERVER_MOCK_H_
+#endif  // CHROME_BROWSER_PREFS_MOCK_PREF_CHANGE_CALLBACK_H_