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

sync/tools/sync_listen_notifications.cc

Index: sync/tools/sync_listen_notifications.cc
===================================================================
--- sync/tools/sync_listen_notifications.cc	(revision 150991)
+++ sync/tools/sync_listen_notifications.cc	(working copy)
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <cstddef>
 #include <cstdio>
 #include <string>
 
@@ -243,15 +242,13 @@
   const char kUniqueId[] = "fake_unique_id";
   sync_notifier->SetUniqueId(kUniqueId);
   sync_notifier->UpdateCredentials(email, token);
-
   // Listen for notifications for all known types.
-  sync_notifier->RegisterHandler(&notification_printer);
   sync_notifier->UpdateRegisteredIds(
       &notification_printer, ModelTypeSetToObjectIdSet(ModelTypeSet::All()));
 
   ui_loop.Run();
 
-  sync_notifier->UnregisterHandler(&notification_printer);
+  sync_notifier->UpdateRegisteredIds(&notification_printer, ObjectIdSet());
   io_thread.Stop();
   return 0;
 }