[Sync] Avoid unregistering object IDs on shutdown

sync/notifier/non_blocking_invalidation_notifier_unittest.cc

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..08eb6208c159a23d03479b5fbda68f2311d22281 100644
--- a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
+++ b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
@@ -26,6 +26,8 @@ namespace {
 using ::testing::InSequence;
 using ::testing::StrictMock;
 
+const char kHandlerName[] = "MockObserver";
+
 class NonBlockingInvalidationNotifierTest : public testing::Test {
  public:
   NonBlockingInvalidationNotifierTest() : io_thread_("Test IO thread") {}
@@ -49,7 +51,7 @@ class NonBlockingInvalidationNotifierTest : public testing::Test {
   }
 
   virtual void TearDown() {
-    invalidation_notifier_->UpdateRegisteredIds(&mock_observer_, ObjectIdSet());
+    invalidation_notifier_->SetHandler(kHandlerName, NULL);
     invalidation_notifier_.reset();
     request_context_getter_ = NULL;
     io_thread_.Stop();
@@ -64,13 +66,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 +83,11 @@ TEST_F(NonBlockingInvalidationNotifierTest, Basic) {
   EXPECT_CALL(mock_observer_,
               OnNotificationsDisabled(NOTIFICATION_CREDENTIALS_REJECTED));
 
+  invalidation_notifier_->SetHandler(kHandlerName, &mock_observer_);
+
+  invalidation_notifier_->UpdateRegisteredIds(
+      kHandlerName, ModelTypeSetToObjectIdSet(models));
+
   invalidation_notifier_->SetStateDeprecated("fake_state");
   invalidation_notifier_->SetUniqueId("fake_id");
   invalidation_notifier_->UpdateCredentials("foo@bar.com", "fake_token");