Revert 150990 - [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::RegisterHandler(SyncNotifierObserver* handler) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  registrar_.RegisterHandler(handler);
-}
-
 void P2PNotifier::UpdateRegisteredIds(SyncNotifierObserver* handler,
                                       const ObjectIdSet& ids) {
-  // TODO(akalin): Handle arbitrary object IDs (http://crbug.com/140411).
-  DCHECK(thread_checker_.CalledOnValidThread());
-  registrar_.UpdateRegisteredIds(handler, ids);
-  const ModelTypeSet enabled_types =
-      ObjectIdSetToModelTypeSet(registrar_.GetAllRegisteredIds());
+  const ModelTypeSet enabled_types = ObjectIdSetToModelTypeSet(
+      helper_.UpdateRegisteredIds(handler, ids));
   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::UnregisterHandler(SyncNotifierObserver* handler) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  registrar_.UnregisterHandler(handler);
-}
-
 void P2PNotifier::SetUniqueId(const std::string& unique_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   unique_id_ = unique_id;
 }
 
 void P2PNotifier::SetStateDeprecated(const std::string& state) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Do nothing.
 }
 
@@ skipping 18 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   const P2PNotificationData notification_data(
       unique_id_, send_notification_target_, changed_types);
   SendNotificationData(notification_data);
 }
 
 void P2PNotifier::OnNotificationsEnabled() {
   DCHECK(thread_checker_.CalledOnValidThread());
   bool just_turned_on = (notifications_enabled_ == false);
   notifications_enabled_ = true;
-  registrar_.EmitOnNotificationsEnabled();
+  helper_.EmitOnNotificationsEnabled();
   if (just_turned_on) {
     const P2PNotificationData notification_data(
         unique_id_, NOTIFY_SELF, enabled_types_);
     SendNotificationData(notification_data);
   }
 }
 
 void P2PNotifier::OnNotificationsDisabled(
     notifier::NotificationsDisabledReason reason) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  registrar_.EmitOnNotificationsDisabled(FromNotifierReason(reason));
+  helper_.EmitOnNotificationsDisabled(FromNotifierReason(reason));
 }
 
 void P2PNotifier::OnIncomingNotification(
     const notifier::Notification& notification) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DVLOG(1) << "Received notification " << notification.ToString();
   if (!logged_in_) {
     DVLOG(1) << "Not logged in yet -- not emitting notification";
     return;
   }
@@ skipping 18 matching lines @@
     return;
   }
   const ModelTypeSet types_to_notify =
       Intersection(enabled_types_, notification_data.GetChangedTypes());
   if (types_to_notify.Empty()) {
     DVLOG(1) << "No enabled and changed types -- not emitting notification";
     return;
   }
   const ModelTypePayloadMap& type_payloads = ModelTypePayloadMapFromEnumSet(
       notification_data.GetChangedTypes(), std::string());
-  registrar_.DispatchInvalidationsToHandlers(
+  helper_.DispatchInvalidationsToHandlers(
       ModelTypePayloadMapToObjectIdPayloadMap(type_payloads),
       REMOTE_NOTIFICATION);
 }
 
 void P2PNotifier::SendNotificationDataForTest(
     const P2PNotificationData& notification_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SendNotificationData(notification_data);
 }
 
 void P2PNotifier::SendNotificationData(
     const P2PNotificationData& notification_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (notification_data.GetChangedTypes().Empty()) {
     DVLOG(1) << "Not sending XMPP notification with no changed types: "
              << notification_data.ToString();
     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