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 0cadd4a0c2dacdd23016c853d538179045cce9c6..f237cdb8f4a06d32a6c8e8be7e676fa238bfadf6 100644 |
--- a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc |
+++ b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc |
@@ -46,10 +46,11 @@ class NonBlockingInvalidationNotifierTest : public testing::Test { |
std::string(), // initial_invalidation_state |
MakeWeakHandle(base::WeakPtr<InvalidationStateTracker>()), |
"fake_client_info")); |
+ invalidation_notifier_->RegisterHandler(&mock_observer_); |
} |
virtual void TearDown() { |
- invalidation_notifier_->UpdateRegisteredIds(&mock_observer_, ObjectIdSet()); |
+ invalidation_notifier_->UnregisterHandler(&mock_observer_); |
invalidation_notifier_.reset(); |
request_context_getter_ = NULL; |
io_thread_.Stop(); |
@@ -64,13 +65,12 @@ class NonBlockingInvalidationNotifierTest : public testing::Test { |
notifier::FakeBaseTask fake_base_task_; |
}; |
+// TODO(akalin): Add real unit tests (http://crbug.com/140410). |
+ |
TEST_F(NonBlockingInvalidationNotifierTest, Basic) { |
InSequence dummy; |
- ModelTypeSet models(PREFERENCES, BOOKMARKS, AUTOFILL); |
- invalidation_notifier_->UpdateRegisteredIds( |
- &mock_observer_, ModelTypeSetToObjectIdSet(models)); |
- |
+ const ModelTypeSet models(PREFERENCES, BOOKMARKS, AUTOFILL); |
const ModelTypePayloadMap& type_payloads = |
ModelTypePayloadMapFromEnumSet(models, "payload"); |
EXPECT_CALL(mock_observer_, OnNotificationsEnabled()); |
@@ -82,6 +82,9 @@ TEST_F(NonBlockingInvalidationNotifierTest, Basic) { |
EXPECT_CALL(mock_observer_, |
OnNotificationsDisabled(NOTIFICATION_CREDENTIALS_REJECTED)); |
+ invalidation_notifier_->UpdateRegisteredIds( |
+ &mock_observer_, ModelTypeSetToObjectIdSet(models)); |
+ |
invalidation_notifier_->SetStateDeprecated("fake_state"); |
invalidation_notifier_->SetUniqueId("fake_id"); |
invalidation_notifier_->UpdateCredentials("foo@bar.com", "fake_token"); |