diff options
Diffstat (limited to 'chrome/browser')
3 files changed, 10 insertions, 9 deletions
diff --git a/chrome/browser/password_manager/password_store_default_unittest.cc b/chrome/browser/password_manager/password_store_default_unittest.cc index 43bed39..eb8f030 100644 --- a/chrome/browser/password_manager/password_store_default_unittest.cc +++ b/chrome/browser/password_manager/password_store_default_unittest.cc @@ -14,9 +14,10 @@ #include "chrome/browser/password_manager/password_form_data.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/webdata/web_data_service.h" -#include "chrome/common/notification_service.h" +#include "chrome/common/notification_details.h" +#include "chrome/common/notification_observer_mock.h" +#include "chrome/common/notification_source.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" @@ -69,7 +70,7 @@ class DBThreadObserverHelper : registrar_.RemoveAll(); } - MockNotificationObserver& observer() { + NotificationObserverMock& observer() { return observer_; } @@ -86,7 +87,7 @@ class DBThreadObserverHelper : WaitableEvent done_event_; NotificationRegistrar registrar_; - MockNotificationObserver observer_; + NotificationObserverMock observer_; }; } // anonymous namespace diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc index 8379600..eb9f5b3 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 { diff --git a/chrome/browser/policy/device_management_policy_provider_unittest.cc b/chrome/browser/policy/device_management_policy_provider_unittest.cc index 3269531..3d85397 100644 --- a/chrome/browser/policy/device_management_policy_provider_unittest.cc +++ b/chrome/browser/policy/device_management_policy_provider_unittest.cc @@ -13,9 +13,9 @@ #include "chrome/browser/policy/mock_configuration_policy_store.h" #include "chrome/browser/policy/mock_device_management_backend.h" #include "chrome/common/net/gaia/gaia_constants.h" +#include "chrome/common/notification_observer_mock.h" #include "chrome/common/notification_service.h" #include "chrome/common/policy_constants.h" -#include "chrome/test/mock_notification_observer.h" #include "chrome/test/testing_device_token_fetcher.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" @@ -193,7 +193,7 @@ TEST_F(DeviceManagementPolicyProviderTest, SecondProvide) { // When policy is successfully fetched from the device management server, it // should force a policy refresh. TEST_F(DeviceManagementPolicyProviderTest, FetchTriggersRefresh) { - MockNotificationObserver observer; + NotificationObserverMock observer; NotificationRegistrar registrar; registrar.Add(&observer, NotificationType::POLICY_CHANGED, |