[Sync] Avoid unregistering object IDs on shutdown

chrome/browser/sync/profile_sync_service_unittest.cc

Index: chrome/browser/sync/profile_sync_service_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index e5c3b94704fb8257f5b678bf3f1dc51de0e015e8..e74626dae26a133cbd1652a413c2ba4e6a29dbd3 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -46,6 +46,8 @@ using testing::Mock;
 using testing::Return;
 using testing::StrictMock;
 
+const char kHandlerName[] = "MockObserver";
+
 class ProfileSyncServiceTest : public testing::Test {
  protected:
   ProfileSyncServiceTest()
@@ -389,7 +391,8 @@ TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIds) {
   EXPECT_CALL(observer, OnIncomingNotification(
       payloads, syncer::REMOTE_NOTIFICATION));
 
-  service_->UpdateRegisteredInvalidationIds(&observer, ids);
+  service_->SetInvalidationHandler(kHandlerName, &observer);
+  service_->UpdateRegisteredInvalidationIds(kHandlerName, ids);
 
   SyncBackendHostForProfileSyncTest* const backend =
       service_->GetBackendForTest();
@@ -400,7 +403,7 @@ TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIds) {
 
   Mock::VerifyAndClearExpectations(&observer);
 
-  service_->UpdateRegisteredInvalidationIds(&observer, syncer::ObjectIdSet());
+  service_->SetInvalidationHandler(kHandlerName, NULL);
 
   backend->EmitOnNotificationsEnabled();
   backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR);
@@ -418,7 +421,8 @@ TEST_F(ProfileSyncServiceTest, UpdateRegisteredInvalidationIdsPersistence) {
 
   syncer::ObjectIdSet ids;
   ids.insert(invalidation::ObjectId(3, "id3"));
-  service_->UpdateRegisteredInvalidationIds(&observer, ids);
+  service_->SetInvalidationHandler(kHandlerName, &observer);
+  service_->UpdateRegisteredInvalidationIds(kHandlerName, ids);
 
   service_->StopAndSuppress();
   service_->UnsuppressAndStart();