Remove the last usages of PrefObserver outside of Prefs.

chrome/browser/prefs/pref_notifier_impl_unittest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/prefs/public/pref_observer.h"
+#include "chrome/browser/prefs/mock_pref_change_callback.h"
 #include "chrome/browser/prefs/pref_notifier_impl.h"
-#include "chrome/browser/prefs/pref_observer_mock.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::Field;
 using testing::Invoke;
@@ skipping 45 matching lines @@
     }
 
     return count;
   }
 
   // Make public for tests below.
   using PrefNotifierImpl::OnPreferenceChanged;
   using PrefNotifierImpl::OnInitializationCompleted;
 };
 
+class PrefObserverMock : public PrefObserver {
+ public:
+  PrefObserverMock() {}
+  virtual ~PrefObserverMock() {}
+
+  MOCK_METHOD2(OnPreferenceChanged, void(PrefServiceBase*, const std::string&));

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

same comment regarding moving the mock declaration.

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

In this case it needs to derive from PrefObserver, so I think it's cleaner to
make it a separate class from the test class.  WDYT?

[Mattias Nissler (ping if slow), 2012/12/04 11:18:33]

Yes, you are right, I had missed that this version needs to  extend
PrefObserver.

+
+  void Expect(PrefServiceBase* prefs,
+              const std::string& pref_name,
+              const Value* value) {
+    EXPECT_CALL(*this, OnPreferenceChanged(prefs, pref_name))
+        .With(PrefValueMatches(prefs, pref_name, value));
+  }
+};
+
 // Test fixture class.
 class PrefNotifierTest : public testing::Test {
  protected:
   virtual void SetUp() {
     pref_service_.RegisterBooleanPref(kChangedPref,
                                       true,
                                       PrefService::UNSYNCABLE_PREF);
     pref_service_.RegisterBooleanPref(kUnchangedPref,
                                       true,
                                       PrefService::UNSYNCABLE_PREF);
@@ skipping 120 matching lines @@
   EXPECT_CALL(obs2_, OnPreferenceChanged(&pref_service_, kChangedPref));
   notifier.OnPreferenceChanged(kChangedPref);
   Mock::VerifyAndClearExpectations(&obs1_);
   Mock::VerifyAndClearExpectations(&obs2_);
 
   notifier.RemovePrefObserver(kChangedPref, &obs2_);
   notifier.RemovePrefObserver(kUnchangedPref, &obs2_);
 }
 
 }  // namespace