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

chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc

Index: chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc
===================================================================
--- chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc	(revision 150991)
+++ chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc	(working copy)
@@ -35,11 +35,8 @@
       : ChromeSyncNotificationBridge(profile, sync_task_runner) {}
   virtual ~MockChromeSyncNotificationBridge() {}
 
-  MOCK_METHOD1(RegisterHandler, void(syncer::SyncNotifierObserver*));
-  MOCK_METHOD2(UpdateRegisteredIds,
-               void(syncer::SyncNotifierObserver*,
-                    const syncer::ObjectIdSet&));
-  MOCK_METHOD1(UnregisterHandler, void(syncer::SyncNotifierObserver*));
+  MOCK_METHOD2(UpdateRegisteredIds, void(syncer::SyncNotifierObserver*,
+                                         const syncer::ObjectIdSet&));
 };
 
 class MockSyncNotifier : public syncer::SyncNotifier {
@@ -47,11 +44,8 @@
   MockSyncNotifier() {}
   virtual ~MockSyncNotifier() {}
 
-  MOCK_METHOD1(RegisterHandler, void(syncer::SyncNotifierObserver*));
   MOCK_METHOD2(UpdateRegisteredIds,
-               void(syncer::SyncNotifierObserver*,
-                    const syncer::ObjectIdSet&));
-  MOCK_METHOD1(UnregisterHandler, void(syncer::SyncNotifierObserver*));
+               void(syncer::SyncNotifierObserver*, const syncer::ObjectIdSet&));
   MOCK_METHOD1(SetUniqueId, void(const std::string&));
   MOCK_METHOD1(SetStateDeprecated, void(const std::string&));
   MOCK_METHOD2(UpdateCredentials, void(const std::string&, const std::string&));
@@ -59,9 +53,8 @@
 };
 
 // All tests just verify that each call is passed through to the delegate, with
-// the exception of RegisterHandler, UnregisterHandler, and
-// UpdateRegisteredIds, which also verifies the call is forwarded to the
-// bridge.
+// the exception of UpdateRegisteredIds, which also verifies the call is
+// forwarded to the bridge.
 class BridgedSyncNotifierTest : public testing::Test {
  public:
   BridgedSyncNotifierTest()
@@ -80,28 +73,15 @@
   BridgedSyncNotifier bridged_notifier_;
 };
 
-TEST_F(BridgedSyncNotifierTest, RegisterHandler) {
-  syncer::MockSyncNotifierObserver observer;
-  EXPECT_CALL(mock_bridge_, RegisterHandler(&observer));
-  EXPECT_CALL(*mock_delegate_, RegisterHandler(&observer));
-  bridged_notifier_.RegisterHandler(&observer);
-}
-
 TEST_F(BridgedSyncNotifierTest, UpdateRegisteredIds) {
+  syncer::MockSyncNotifierObserver observer;
   EXPECT_CALL(mock_bridge_, UpdateRegisteredIds(
-      NULL, syncer::ObjectIdSet()));
+      &observer, syncer::ObjectIdSet()));
   EXPECT_CALL(*mock_delegate_, UpdateRegisteredIds(
-      NULL, syncer::ObjectIdSet()));
-  bridged_notifier_.UpdateRegisteredIds(NULL, syncer::ObjectIdSet());
+      &observer, syncer::ObjectIdSet()));
+  bridged_notifier_.UpdateRegisteredIds(&observer, syncer::ObjectIdSet());
 }
 
-TEST_F(BridgedSyncNotifierTest, UnregisterHandler) {
-  syncer::MockSyncNotifierObserver observer;
-  EXPECT_CALL(mock_bridge_, UnregisterHandler(&observer));
-  EXPECT_CALL(*mock_delegate_, UnregisterHandler(&observer));
-  bridged_notifier_.UnregisterHandler(&observer);
-}
-
 TEST_F(BridgedSyncNotifierTest, SetUniqueId) {
   std::string unique_id = "unique id";
   EXPECT_CALL(*mock_delegate_, SetUniqueId(unique_id));