Revert 150990 - [Sync] Avoid unregistering object IDs on shutdown

chrome/browser/sync/profile_sync_service_unittest.cc

Index: chrome/browser/sync/profile_sync_service_unittest.cc
===================================================================
--- chrome/browser/sync/profile_sync_service_unittest.cc	(revision 150991)
+++ chrome/browser/sync/profile_sync_service_unittest.cc	(working copy)
@@ -389,7 +389,6 @@
   EXPECT_CALL(observer, OnNotificationsDisabled(
       syncer::TRANSIENT_NOTIFICATION_ERROR));
 
-  service_->RegisterInvalidationHandler(&observer);
   service_->UpdateRegisteredInvalidationIds(&observer, ids);
 
   SyncBackendHostForProfileSyncTest* const backend =
@@ -401,7 +400,7 @@
 
   Mock::VerifyAndClearExpectations(&observer);
 
-  service_->UnregisterInvalidationHandler(&observer);
+  service_->UpdateRegisteredInvalidationIds(&observer, syncer::ObjectIdSet());
 
   backend->EmitOnNotificationsEnabled();
   backend->EmitOnIncomingNotification(payloads, syncer::REMOTE_NOTIFICATION);
@@ -426,7 +425,6 @@
   EXPECT_CALL(observer, OnNotificationsDisabled(
       syncer::TRANSIENT_NOTIFICATION_ERROR));
 
-  service_->RegisterInvalidationHandler(&observer);
   service_->UpdateRegisteredInvalidationIds(&observer, ids);
 
   service_->StopAndSuppress();