Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Unified Diff: chrome/browser/password_manager/password_store_x_unittest.cc

Issue 5448001: Remove duplicate NotificationObserver mock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/password_manager/password_store_x_unittest.cc
diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc
index 837960099fbf4b7e4cf7675a7918594c167977ce..eb9f5b34580064fb1ad018beb73955ab1435705e 100644
--- a/chrome/browser/password_manager/password_store_x_unittest.cc
+++ b/chrome/browser/password_manager/password_store_x_unittest.cc
@@ -12,9 +12,9 @@
#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"
@@ -67,7 +67,7 @@ class DBThreadObserverHelper
registrar_.RemoveAll();
}
- MockNotificationObserver& observer() {
+ NotificationObserverMock& observer() {
return observer_;
}
@@ -84,7 +84,7 @@ class DBThreadObserverHelper
WaitableEvent done_event_;
NotificationRegistrar registrar_;
- MockNotificationObserver observer_;
+ NotificationObserverMock observer_;
};
class FailingBackend : public PasswordStoreX::NativeBackend {

Powered by Google App Engine
This is Rietveld 408576698