[Sync] Avoid unregistering object IDs on shutdown

sync/notifier/sync_notifier_factory_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/sync_notifier_factory.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 namespace {
 
 using ::testing::Mock;
 using ::testing::NiceMock;
 using ::testing::StrictMock;
 
+const char kHandlerName[] = "MockObserver";
+
 class SyncNotifierFactoryTest : public testing::Test {
  protected:
 
   virtual void SetUp() OVERRIDE {
     notifier_options_.request_context_getter =
         new TestURLRequestContextGetter(message_loop_.message_loop_proxy());
   }
 
   virtual void TearDown() OVERRIDE {
     Mock::VerifyAndClearExpectations(&mock_observer_);
@@ skipping 12 matching lines @@
   SyncNotifierFactory factory(
       notifier_options_,
       "test client info",
       base::WeakPtr<InvalidationStateTracker>());
   scoped_ptr<SyncNotifier> notifier(factory.CreateSyncNotifier());
 #if defined(OS_ANDROID)
   ASSERT_FALSE(notifier.get());
 #else
   ASSERT_TRUE(notifier.get());
   ObjectIdSet ids = ModelTypeSetToObjectIdSet(ModelTypeSet(syncer::BOOKMARKS));
-  notifier->UpdateRegisteredIds(&mock_observer_, ids);
-  notifier->UpdateRegisteredIds(&mock_observer_, ObjectIdSet());
+  notifier->SetHandler(kHandlerName, &mock_observer_);
+  notifier->UpdateRegisteredIds(kHandlerName, ids);
+  notifier->SetHandler(kHandlerName, NULL);
 #endif
 }
 
 // Test basic creation of a P2PNotifier.
 TEST_F(SyncNotifierFactoryTest, Basic_P2P) {
   notifier_options_.notification_method = notifier::NOTIFICATION_P2P;
   SyncNotifierFactory factory(
       notifier_options_,
       "test client info",
       base::WeakPtr<InvalidationStateTracker>());
   scoped_ptr<SyncNotifier> notifier(factory.CreateSyncNotifier());
 #if defined(OS_ANDROID)
   ASSERT_FALSE(notifier.get());
 #else
   ASSERT_TRUE(notifier.get());
   ObjectIdSet ids = ModelTypeSetToObjectIdSet(ModelTypeSet(syncer::BOOKMARKS));
-  notifier->UpdateRegisteredIds(&mock_observer_, ids);
-  notifier->UpdateRegisteredIds(&mock_observer_, ObjectIdSet());
+  notifier->SetHandler(kHandlerName, &mock_observer_);
+  notifier->UpdateRegisteredIds(kHandlerName, ids);
+  notifier->SetHandler(kHandlerName, NULL);
 #endif
 }
 
 }  // namespace
 }  // namespace syncer