diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /chrome/browser/password_manager | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'chrome/browser/password_manager')
| -rw-r--r-- | chrome/browser/password_manager/password_store_default_unittest.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/password_manager/password_store_x_unittest.cc | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index d657582..43bed39 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -16,6 +16,7 @@ #include "chrome/browser/webdata/web_data_service.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" @@ -44,13 +45,6 @@ class MockWebDataServiceConsumer : public WebDataServiceConsumer { const WDTypedResult*)); }; -class MockNotificationObserver : public NotificationObserver { - public: - MOCK_METHOD3(Observe, void(NotificationType, - const NotificationSource&, - const NotificationDetails&)); -}; - // This class will add and remove a mock notification observer from // the DB thread. class DBThreadObserverHelper : diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index 55d6391..8379600 100644 --- a/chrome/browser/password_manager/password_store_x_unittest.cc +++ b/chrome/browser/password_manager/password_store_x_unittest.cc @@ -14,6 +14,7 @@ #include "chrome/browser/webdata/web_data_service.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" @@ -44,13 +45,6 @@ class MockWebDataServiceConsumer : public WebDataServiceConsumer { const WDTypedResult*)); }; -class MockNotificationObserver : public NotificationObserver { - public: - MOCK_METHOD3(Observe, void(NotificationType, - const NotificationSource&, - const NotificationDetails&)); -}; - // This class will add and remove a mock notification observer from // the DB thread. class DBThreadObserverHelper |