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

chrome/browser/sync/profile_sync_service_password_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 <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/profile_mock.h"
 #include "content/public/browser/notification_source.h"
-#include "content/test/notification_observer_mock.h"
+#include "content/public/test/mock_notification_observer.h"
 #include "content/test/test_browser_thread.h"
 #include "sync/internal_api/read_node.h"
 #include "sync/internal_api/read_transaction.h"
 #include "sync/internal_api/write_node.h"
 #include "sync/internal_api/write_transaction.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "sync/syncable/syncable.h"
 #include "sync/test/engine/test_id_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/forms/password_form.h"
@@ skipping 234 matching lines @@
            lhs.date_created == rhs.date_created &&
            lhs.blacklisted_by_user == rhs.blacklisted_by_user;
   }
 
   void SetIdleChangeProcessorExpectations() {
     EXPECT_CALL(*password_store_, AddLoginImpl(_)).Times(0);
     EXPECT_CALL(*password_store_, UpdateLoginImpl(_)).Times(0);
     EXPECT_CALL(*password_store_, RemoveLoginImpl(_)).Times(0);
   }
 
-  content::NotificationObserverMock observer_;
+  content::MockNotificationObserver observer_;
   ProfileMock profile_;
   scoped_refptr<MockPasswordStore> password_store_;
   content::NotificationRegistrar registrar_;
 };
 
 void AddPasswordEntriesCallback(ProfileSyncServicePasswordTest* test,
                                 const std::vector<PasswordForm>& entries) {
   for (size_t i = 0; i < entries.size(); ++i)
     test->AddPasswordSyncNode(entries[i]);
 }
@@ skipping 287 matching lines @@
   CreateRootHelper create_root(this, syncable::PASSWORDS);
   StartSyncService(create_root.callback(),
                    base::Bind(&AddPasswordEntriesCallback, this, sync_forms));
 
   std::vector<PasswordForm> new_sync_forms;
   GetPasswordEntriesFromSyncDB(&new_sync_forms);
 
   EXPECT_EQ(1U, new_sync_forms.size());
   EXPECT_TRUE(ComparePasswords(expected_forms[0], new_sync_forms[0]));
 }