Move mock notification observer header from content\test to content\public\test. This way we can en…

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 "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 "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
-#include "content/test/notification_observer_mock.h"
+#include "content/public/test/mock_notification_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::Field;
 using testing::Invoke;
 using testing::Mock;
 using testing::Truly;
 
 namespace {
@@ skipping 48 matching lines @@
 };
 
 TEST_F(PrefNotifierTest, OnPreferenceChanged) {
   MockPrefNotifier notifier(&pref_service_);
   EXPECT_CALL(notifier, FireObservers(kChangedPref)).Times(1);
   notifier.OnPreferenceChanged(kChangedPref);
 }
 
 TEST_F(PrefNotifierTest, OnInitializationCompleted) {
   MockPrefNotifier notifier(&pref_service_);
-  content::NotificationObserverMock observer;
+  content::MockNotificationObserver observer;
   content::NotificationRegistrar registrar;
   registrar.Add(&observer, chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED,
                 content::Source<PrefService>(&pref_service_));
   EXPECT_CALL(observer, Observe(
       int(chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED),
       content::Source<PrefService>(&pref_service_),
       Property(&content::Details<bool>::ptr, testing::Pointee(true))));
   notifier.OnInitializationCompleted(true);
 }
 
@@ skipping 97 matching lines @@
   obs2_.Expect(&pref_service_, kChangedPref, &value_true);
   notifier.OnPreferenceChanged(kChangedPref);
   Mock::VerifyAndClearExpectations(&obs1_);
   Mock::VerifyAndClearExpectations(&obs2_);
 
   notifier.RemovePrefObserver(kChangedPref, &obs2_);
   notifier.RemovePrefObserver(kUnchangedPref, &obs2_);
 }
 
 }  // namespace