[Sync] Avoid unregistering object IDs on shutdown

sync/notifier/p2p_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/p2p_notifier.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 139 matching lines @@
   DCHECK(send_notification_target_ == NOTIFY_OTHERS ||
          send_notification_target_ == NOTIFY_ALL);
   push_client_->AddObserver(this);
 }
 
 P2PNotifier::~P2PNotifier() {
   DCHECK(thread_checker_.CalledOnValidThread());
   push_client_->RemoveObserver(this);
 }
 
-void P2PNotifier::UpdateRegisteredIds(SyncNotifierObserver* handler,
+void P2PNotifier::SetHandler(const std::string& handler_name,
+                             SyncNotifierObserver* handler) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  helper_.SetHandler(handler_name, handler);
+}
+
+void P2PNotifier::UpdateRegisteredIds(const std::string& handler_name,
                                       const ObjectIdSet& ids) {
-  const ModelTypeSet enabled_types = ObjectIdSetToModelTypeSet(
-      helper_.UpdateRegisteredIds(handler, ids));
+  // TODO(akalin): Handle arbitrary object IDs

[msw, 2012/08/03 23:30:46]

nit: line breaks :)

[akalin, 2012/08/07 07:25:19]

Done.

+  // (http://crbug.com/140411).
+  DCHECK(thread_checker_.CalledOnValidThread());
+  helper_.UpdateRegisteredIds(handler_name, ids);
+  const ModelTypeSet enabled_types =
+      ObjectIdSetToModelTypeSet(helper_.GetAllRegisteredIds());
   const ModelTypeSet new_enabled_types =
       Difference(enabled_types, enabled_types_);
   const P2PNotificationData notification_data(
       unique_id_, NOTIFY_SELF, new_enabled_types);
   SendNotificationData(notification_data);
   enabled_types_ = enabled_types;
 }
 
 void P2PNotifier::SetUniqueId(const std::string& unique_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 103 matching lines @@
     return;
   }
   notifier::Notification notification;
   notification.channel = kSyncP2PNotificationChannel;
   notification.data = notification_data.ToString();
   DVLOG(1) << "Sending XMPP notification: " << notification.ToString();
   push_client_->SendNotification(notification);
 }
 
 }  // namespace syncer