[Sync] Avoid unregistering object IDs on shutdown

sync/internal_api/sync_manager_impl_unittest.cc

Index: sync/internal_api/sync_manager_impl_unittest.cc
diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc
index 0e6b4643f35dd4d81dbe5145385b93b832138a2e..05f264bd0203ec2940697cf6cb5189fe875eede2 100644
--- a/sync/internal_api/sync_manager_impl_unittest.cc
+++ b/sync/internal_api/sync_manager_impl_unittest.cc
@@ -696,8 +696,9 @@ class SyncManagerObserverMock : public SyncManager::Observer {
 
 class SyncNotifierMock : public SyncNotifier {
  public:
+  MOCK_METHOD2(SetHandler, void(const std::string&, SyncNotifierObserver*));
   MOCK_METHOD2(UpdateRegisteredIds,
-               void(SyncNotifierObserver*, const ObjectIdSet&));
+               void(const std::string&, const ObjectIdSet&));
   MOCK_METHOD1(SetUniqueId, void(const std::string&));
   MOCK_METHOD1(SetStateDeprecated, void(const std::string&));
   MOCK_METHOD2(UpdateCredentials,
@@ -742,6 +743,8 @@ class SyncManagerTest : public testing::Test,
     EXPECT_CALL(*sync_notifier_mock_, SetStateDeprecated(""));
     EXPECT_CALL(*sync_notifier_mock_,
                 UpdateCredentials(credentials.email, credentials.sync_token));
+    EXPECT_CALL(*sync_notifier_mock_, SetHandler("SyncManagerImpl", _))
+        .Times(2);
 
     sync_manager_.AddObserver(&observer_);
     EXPECT_CALL(observer_, OnInitializationComplete(_, _, _)).
@@ -782,7 +785,6 @@ class SyncManagerTest : public testing::Test,
 
   void TearDown() {
     sync_manager_.RemoveObserver(&observer_);
-    EXPECT_CALL(*sync_notifier_mock_, UpdateRegisteredIds(_, ObjectIdSet()));
     sync_manager_.ShutdownOnSyncThread();
     sync_notifier_mock_ = NULL;
     PumpLoop();
@@ -956,16 +958,24 @@ TEST_F(SyncManagerTest, UpdateEnabledTypes) {
   ModelSafeRoutingInfo routes;
   GetModelSafeRoutingInfo(&routes);
   const ModelTypeSet enabled_types = GetRoutingInfoTypes(routes);
-
   EXPECT_CALL(*sync_notifier_mock_,
               UpdateRegisteredIds(
                   _, ModelTypeSetToObjectIdSet(enabled_types)));
+
   sync_manager_.UpdateEnabledTypes(enabled_types);
 }
 
+TEST_F(SyncManagerTest, SetInvalidationHandler) {
+  const char kHandlerName[] = "handler";
+  EXPECT_CALL(*sync_notifier_mock_, SetHandler(kHandlerName, NULL));
+  sync_manager_.SetInvalidationHandler(kHandlerName, NULL);
+}
+
 TEST_F(SyncManagerTest, UpdateRegisteredInvalidationIds) {
-  EXPECT_CALL(*sync_notifier_mock_, UpdateRegisteredIds(NULL, ObjectIdSet()));
-  sync_manager_.UpdateRegisteredInvalidationIds(NULL, ObjectIdSet());
+  const char kHandlerName[] = "handler";
+  EXPECT_CALL(*sync_notifier_mock_,
+              UpdateRegisteredIds(kHandlerName, ObjectIdSet()));
+  sync_manager_.UpdateRegisteredInvalidationIds(kHandlerName, ObjectIdSet());
 }
 
 TEST_F(SyncManagerTest, ProcessJsMessage) {