Index: sync/notifier/non_blocking_invalidation_notifier_unittest.cc |
diff --git a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc |
index a749b64971e94f3df5daf45efd9f9cc4cece5ecc..5b39355f279efdae1f3ff0652281261757f4a09f 100644 |
--- a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc |
+++ b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc |
@@ -14,7 +14,7 @@ |
#include "sync/internal_api/public/base/model_type.h" |
#include "sync/internal_api/public/base/model_type_state_map.h" |
#include "sync/internal_api/public/util/weak_handle.h" |
-#include "sync/notifier/fake_sync_notifier_observer.h" |
+#include "sync/notifier/fake_invalidation_handler.h" |
#include "sync/notifier/invalidation_state_tracker.h" |
#include "sync/notifier/object_id_state_map_test_util.h" |
#include "testing/gmock/include/gmock/gmock.h" |
@@ -47,11 +47,11 @@ class NonBlockingInvalidationNotifierTest : public testing::Test { |
std::string(), // initial_invalidation_state |
MakeWeakHandle(base::WeakPtr<InvalidationStateTracker>()), |
"fake_client_info")); |
- invalidation_notifier_->RegisterHandler(&fake_observer_); |
+ invalidation_notifier_->RegisterHandler(&fake_handler_); |
} |
virtual void TearDown() { |
- invalidation_notifier_->UnregisterHandler(&fake_observer_); |
+ invalidation_notifier_->UnregisterHandler(&fake_handler_); |
invalidation_notifier_.reset(); |
request_context_getter_ = NULL; |
io_thread_.Stop(); |
@@ -62,7 +62,7 @@ class NonBlockingInvalidationNotifierTest : public testing::Test { |
base::Thread io_thread_; |
scoped_refptr<net::URLRequestContextGetter> request_context_getter_; |
scoped_ptr<NonBlockingInvalidationNotifier> invalidation_notifier_; |
- FakeSyncNotifierObserver fake_observer_; |
+ FakeInvalidationHandler fake_handler_; |
notifier::FakeBaseTask fake_base_task_; |
}; |
@@ -75,7 +75,7 @@ TEST_F(NonBlockingInvalidationNotifierTest, Basic) { |
ModelTypeSetToStateMap(models, "payload")); |
invalidation_notifier_->UpdateRegisteredIds( |
- &fake_observer_, ModelTypeSetToObjectIdSet(models)); |
+ &fake_handler_, ModelTypeSetToObjectIdSet(models)); |
invalidation_notifier_->SetStateDeprecated("fake_state"); |
invalidation_notifier_->SetUniqueId("fake_id"); |
@@ -83,23 +83,23 @@ TEST_F(NonBlockingInvalidationNotifierTest, Basic) { |
invalidation_notifier_->OnNotificationsEnabled(); |
EXPECT_EQ(NO_NOTIFICATION_ERROR, |
- fake_observer_.GetNotificationsDisabledReason()); |
+ fake_handler_.GetNotificationsDisabledReason()); |
invalidation_notifier_->OnIncomingNotification( |
id_state_map, REMOTE_NOTIFICATION); |
EXPECT_THAT(id_state_map, |
- Eq(fake_observer_.GetLastNotificationIdStateMap())); |
- EXPECT_EQ(REMOTE_NOTIFICATION, fake_observer_.GetLastNotificationSource()); |
+ Eq(fake_handler_.GetLastNotificationIdStateMap())); |
+ EXPECT_EQ(REMOTE_NOTIFICATION, fake_handler_.GetLastNotificationSource()); |
invalidation_notifier_->OnNotificationsDisabled( |
TRANSIENT_NOTIFICATION_ERROR); |
EXPECT_EQ(TRANSIENT_NOTIFICATION_ERROR, |
- fake_observer_.GetNotificationsDisabledReason()); |
+ fake_handler_.GetNotificationsDisabledReason()); |
invalidation_notifier_->OnNotificationsDisabled( |
NOTIFICATION_CREDENTIALS_REJECTED); |
EXPECT_EQ(NOTIFICATION_CREDENTIALS_REJECTED, |
- fake_observer_.GetNotificationsDisabledReason()); |
+ fake_handler_.GetNotificationsDisabledReason()); |
ui_loop_.RunAllPending(); |
} |