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

chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc

Index: chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
===================================================================
--- chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc	(revision 150991)
+++ chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc	(working copy)
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
 
-#include <cstddef>
-
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -55,7 +53,6 @@
         expected_payloads_(expected_payloads),
         expected_source_(expected_source) {
     DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
-    bridge_->RegisterHandler(this);
     const syncer::ObjectIdSet& ids =
         syncer::ObjectIdPayloadMapToSet(expected_payloads);
     bridge_->UpdateRegisteredIds(this, ids);
@@ -63,7 +60,7 @@
 
   virtual ~FakeSyncNotifierObserver() {
     DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
-    bridge_->UnregisterHandler(this);
+    bridge_->UpdateRegisteredIds(this, syncer::ObjectIdSet());
   }
 
   // SyncNotifierObserver implementation.
@@ -123,7 +120,6 @@
   }
 
   virtual void TearDown() OVERRIDE {
-    bridge_->StopForShutdown();
     sync_thread_.Stop();
     // Must be reset only after the sync thread is stopped.
     bridge_.reset();