[Sync] Avoid unregistering object IDs on shutdown

sync/tools/sync_listen_notifications.cc

Index: sync/tools/sync_listen_notifications.cc
diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index 22b22d6d6d2025c819e913b8c4c6fa63621335da..768303aa8cfe1f1ac2f1684fab30ba46a7100937 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -2,6 +2,7 @@
 // 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>
 
@@ -239,13 +240,16 @@ int SyncListenNotificationsMain(int argc, char* argv[]) {
   const char kUniqueId[] = "fake_unique_id";
   sync_notifier->SetUniqueId(kUniqueId);
   sync_notifier->UpdateCredentials(email, token);
+
   // Listen for notifications for all known types.
+  const char kHandlerName[] = "sync_listen_notifications";
+  sync_notifier->SetHandler(kHandlerName, &notification_printer);
   sync_notifier->UpdateRegisteredIds(
-      &notification_printer, ModelTypeSetToObjectIdSet(ModelTypeSet::All()));
+      kHandlerName, ModelTypeSetToObjectIdSet(ModelTypeSet::All()));
 
   ui_loop.Run();
 
-  sync_notifier->UpdateRegisteredIds(&notification_printer, ObjectIdSet());
+  sync_notifier->SetHandler(kHandlerName, NULL);
   io_thread.Stop();
   return 0;
 }