Remove duplicate NotificationObserver mock.

chrome/browser/password_manager/password_store_x_unittest.cc

 // Copyright (c) 2010 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/basictypes.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/password_manager/password_form_data.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/browser/password_manager/password_store_x.h"
 #include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/common/notification_observer_mock.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/test/mock_notification_observer.h"
 #include "chrome/test/signaling_task.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::WaitableEvent;
 using testing::_;
 using testing::DoAll;
 using testing::ElementsAreArray;
 using testing::Pointee;
@@ skipping 32 matching lines @@
         FROM_HERE,
         NewRunnableMethod(this, &DBThreadObserverHelper::AddObserverTask));
     done_event_.Wait();
   }
 
   virtual ~DBThreadObserverHelper() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
     registrar_.RemoveAll();
   }
 
-  MockNotificationObserver& observer() {
+  NotificationObserverMock& observer() {
     return observer_;
   }
 
  protected:
   friend class base::RefCountedThreadSafe<DBThreadObserverHelper>;
 
   void AddObserverTask() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
     registrar_.Add(&observer_,
                    NotificationType::LOGINS_CHANGED,
                    NotificationService::AllSources());
     done_event_.Signal();
   }
 
   WaitableEvent done_event_;
   NotificationRegistrar registrar_;
-  MockNotificationObserver observer_;
+  NotificationObserverMock observer_;
 };
 
 class FailingBackend : public PasswordStoreX::NativeBackend {
  public:
   virtual bool Init() { return true; }
 
   virtual bool AddLogin(const PasswordForm& form) { return false; }
   virtual bool UpdateLogin(const PasswordForm& form) { return false; }
   virtual bool RemoveLogin(const PasswordForm& form) { return false; }
 
@@ skipping 635 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(NoBackend,
                         PasswordStoreXTest,
                         testing::Values(NO_BACKEND));
 INSTANTIATE_TEST_CASE_P(FailingBackend,
                         PasswordStoreXTest,
                         testing::Values(FAILING_BACKEND));
 INSTANTIATE_TEST_CASE_P(WorkingBackend,
                         PasswordStoreXTest,
                         testing::Values(WORKING_BACKEND));