[Sync] Avoid unregistering object IDs on shutdown

sync/notifier/invalidation_notifier.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/notifier/invalidation_notifier.h"
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "jingle/notifier/listener/push_client.h"
@@ skipping 16 matching lines @@
       invalidation_state_tracker_(invalidation_state_tracker),
       client_info_(client_info),
       invalidation_state_(initial_invalidation_state),
       invalidation_client_(push_client.Pass()) {
 }
 
 InvalidationNotifier::~InvalidationNotifier() {
   DCHECK(CalledOnValidThread());
 }
 
-void InvalidationNotifier::UpdateRegisteredIds(SyncNotifierObserver* handler,
-                                               const ObjectIdSet& ids) {
+void InvalidationNotifier::SetHandler(const std::string& handler_name,
+                                      SyncNotifierObserver* handler) {
   DCHECK(CalledOnValidThread());
-  invalidation_client_.RegisterIds(helper_.UpdateRegisteredIds(handler, ids));
+  helper_.SetHandler(handler_name, handler);
+}
+
+void InvalidationNotifier::UpdateRegisteredIds(
+    const std::string& handler_name,
+    const ObjectIdSet& ids) {
+  DCHECK(CalledOnValidThread());
+  helper_.UpdateRegisteredIds(handler_name, ids);
+  const ObjectIdSet& all_registered_ids = helper_.GetAllRegisteredIds();

[msw, 2012/08/07 20:09:30]

nit: comment explaining when |ids| won't match 
|all_registered_ids|? (It's not obvious to me)

[akalin, 2012/08/07 23:38:05]

ids is only for |handler_name|/|handler|, but all_registered_ids holds all IDs
regardless of handler.  Do you think this still needs a comment?  Is the comment
in SyncNotifierHelper::GetAllRegisteredIds() insufficient?

[msw, 2012/08/08 00:55:23]

Ok, I was simply confused. I think it's odd that the three notifier
implementations need to [re]register all IDs every time any ID changes, but I'll
just presume that's intended.

+  invalidation_client_.RegisterIds(all_registered_ids);
 }
 
 void InvalidationNotifier::SetUniqueId(const std::string& unique_id) {
   DCHECK(CalledOnValidThread());
   invalidation_client_id_ = unique_id;
   DVLOG(1) << "Setting unique ID to " << unique_id;
   CHECK(!invalidation_client_id_.empty());
 }
 
 void InvalidationNotifier::SetStateDeprecated(const std::string& state) {
@@ skipping 45 matching lines @@
   helper_.EmitOnNotificationsEnabled();
 }
 
 void InvalidationNotifier::OnNotificationsDisabled(
     NotificationsDisabledReason reason) {
   DCHECK(CalledOnValidThread());
   helper_.EmitOnNotificationsDisabled(reason);
 }
 
 }  // namespace syncer