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

chrome/browser/prefs/pref_set_observer_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_set_observer.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/public/browser/notification_details.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"
 
 // Unit tests for PrefSetObserver.
 class PrefSetObserverTest : public testing::Test {
  public:
   virtual void SetUp() {
     pref_service_.reset(new TestingPrefService);
     pref_service_->RegisterStringPref(prefs::kHomePage,
                                       "http://google.com",
@@ skipping 43 matching lines @@
 MATCHER_P(PrefNameDetails, name, "details references named preference") {
   std::string* pstr =
       reinterpret_cast<const content::Details<std::string>&>(arg).ptr();
   return pstr && *pstr == name;
 }
 
 TEST_F(PrefSetObserverTest, Observe) {
   using testing::_;
   using testing::Mock;
 
-  content::NotificationObserverMock observer;
+  content::MockNotificationObserver observer;
   scoped_ptr<PrefSetObserver> pref_set(CreatePrefSetObserver(&observer));
 
   EXPECT_CALL(observer,
               Observe(int(chrome::NOTIFICATION_PREF_CHANGED),
                       content::Source<PrefService>(pref_service_.get()),
                       PrefNameDetails(prefs::kHomePage)));
   pref_service_->SetUserPref(prefs::kHomePage,
                              Value::CreateStringValue("http://crbug.com"));
   Mock::VerifyAndClearExpectations(&observer);
 
   EXPECT_CALL(observer,
               Observe(int(chrome::NOTIFICATION_PREF_CHANGED),
                       content::Source<PrefService>(pref_service_.get()),
                       PrefNameDetails(prefs::kHomePageIsNewTabPage)));
   pref_service_->SetUserPref(prefs::kHomePageIsNewTabPage,
                              Value::CreateBooleanValue(true));
   Mock::VerifyAndClearExpectations(&observer);
 
   EXPECT_CALL(observer, Observe(_, _, _)).Times(0);
   pref_service_->SetUserPref(prefs::kApplicationLocale,
                              Value::CreateStringValue("en_US.utf8"));
   Mock::VerifyAndClearExpectations(&observer);
 }