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

sync/notifier/p2p_notifier_unittest.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 <cstddef>
 
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 10 matching lines @@
 using ::testing::StrictMock;
 
 class P2PNotifierTest : public testing::Test {
  protected:
   P2PNotifierTest()
       : fake_push_client_(new notifier::FakePushClient()),
         p2p_notifier_(
             scoped_ptr<notifier::PushClient>(fake_push_client_),
             NOTIFY_OTHERS),
         next_sent_notification_to_reflect_(0) {
-    p2p_notifier_.RegisterHandler(&mock_observer_);
   }
 
   virtual ~P2PNotifierTest() {
-    p2p_notifier_.UnregisterHandler(&mock_observer_);
+    p2p_notifier_.UpdateRegisteredIds(&mock_observer_, ObjectIdSet());
   }
 
   ModelTypePayloadMap MakePayloadMap(ModelTypeSet types) {
     return ModelTypePayloadMapFromEnumSet(types, std::string());
   }
 
   // Simulate receiving all the notifications we sent out since last
   // time this was called.
   void ReflectSentNotifications() {
     const std::vector<notifier::Notification>& sent_notifications =
@@ skipping 88 matching lines @@
   P2PNotificationData notification_data_parsed;
   EXPECT_TRUE(notification_data_parsed.ResetFromString(notification_data_str));
   EXPECT_TRUE(notification_data.Equals(notification_data_parsed));
 }
 
 // Set up the P2PNotifier, simulate a successful connection, and send
 // a notification with the default target (NOTIFY_OTHERS).  The
 // observer should receive only a notification from the call to
 // UpdateEnabledTypes().
 TEST_F(P2PNotifierTest, NotificationsBasic) {
-  const ModelTypeSet enabled_types(BOOKMARKS, PREFERENCES);
+  ModelTypeSet enabled_types(BOOKMARKS, PREFERENCES);
+
+  p2p_notifier_.UpdateRegisteredIds(&mock_observer_,
+                                    ModelTypeSetToObjectIdSet(enabled_types));
 
   EXPECT_CALL(mock_observer_, OnNotificationsEnabled());
   EXPECT_CALL(mock_observer_, OnIncomingNotification(
       ModelTypePayloadMapToObjectIdPayloadMap(MakePayloadMap(enabled_types)),
       REMOTE_NOTIFICATION));
 
-  p2p_notifier_.UpdateRegisteredIds(&mock_observer_,
-                                    ModelTypeSetToObjectIdSet(enabled_types));
-
   p2p_notifier_.SetUniqueId("sender");
 
   const char kEmail[] = "foo@bar.com";
   const char kToken[] = "token";
   p2p_notifier_.UpdateCredentials(kEmail, kToken);
   {
     notifier::Subscription expected_subscription;
     expected_subscription.channel = kSyncP2PNotificationChannel;
     expected_subscription.from = kEmail;
     EXPECT_TRUE(notifier::SubscriptionListsEqual(
@@ skipping 13 matching lines @@
     p2p_notifier_.SendNotification(changed_types);
   }
 
   ReflectSentNotifications();
 }
 
 // Set up the P2PNotifier and send out notifications with various
 // target settings.  The notifications received by the observer should
 // be consistent with the target settings.
 TEST_F(P2PNotifierTest, SendNotificationData) {
-  const ModelTypeSet enabled_types(BOOKMARKS, PREFERENCES, THEMES);
-  const ModelTypeSet changed_types(THEMES, APPS);
-  const ModelTypeSet expected_types(THEMES);
+  ModelTypeSet enabled_types(BOOKMARKS, PREFERENCES, THEMES);
+  ModelTypeSet changed_types(THEMES, APPS);
+  ModelTypeSet expected_types(THEMES);
+
+  p2p_notifier_.UpdateRegisteredIds(&mock_observer_,
+                                    ModelTypeSetToObjectIdSet(enabled_types));
+
+  const ModelTypePayloadMap& expected_payload_map =
+      MakePayloadMap(expected_types);
 
   EXPECT_CALL(mock_observer_, OnNotificationsEnabled());
   EXPECT_CALL(mock_observer_,
               OnIncomingNotification(
                   ModelTypePayloadMapToObjectIdPayloadMap(
                       MakePayloadMap(enabled_types)),
                   REMOTE_NOTIFICATION));
 
-  p2p_notifier_.UpdateRegisteredIds(&mock_observer_,
-                                    ModelTypeSetToObjectIdSet(enabled_types));
-
-  const ModelTypePayloadMap& expected_payload_map =
-      MakePayloadMap(expected_types);
-
   p2p_notifier_.SetUniqueId("sender");
   p2p_notifier_.UpdateCredentials("foo@bar.com", "fake_token");
 
   ReflectSentNotifications();
   fake_push_client_->EnableNotifications();
 
   ReflectSentNotifications();
 
   // Should be dropped.
   Mock::VerifyAndClearExpectations(&mock_observer_);
@@ skipping 72 matching lines @@
   Mock::VerifyAndClearExpectations(&mock_observer_);
   p2p_notifier_.SendNotificationDataForTest(
       P2PNotificationData("sender2", NOTIFY_ALL, ModelTypeSet()));
 
   ReflectSentNotifications();
 }
 
 }  // namespace
 
 }  // namespace syncer