Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

sync/notifier/sync_notifier_factory_unittest.cc

Index: sync/notifier/sync_notifier_factory_unittest.cc
diff --git a/sync/notifier/sync_notifier_factory_unittest.cc b/sync/notifier/sync_notifier_factory_unittest.cc
index 52fd50595008c9d2776e9f1cbdbd64b673ebbaf9..8036c1a172170d66b9298344c7427e0752753074 100644
--- a/sync/notifier/sync_notifier_factory_unittest.cc
+++ b/sync/notifier/sync_notifier_factory_unittest.cc
@@ -60,8 +60,9 @@ TEST_F(SyncNotifierFactoryTest, Basic) {
   ASSERT_FALSE(notifier.get());
 #else
   ASSERT_TRUE(notifier.get());
-  notifier->AddObserver(&mock_observer_);
-  notifier->RemoveObserver(&mock_observer_);
+  ObjectIdSet ids = ModelTypeSetToObjectIdSet(ModelTypeSet(syncer::BOOKMARKS));
+  notifier->UpdateRegisteredIds(&mock_observer_, ids);
+  notifier->UpdateRegisteredIds(&mock_observer_, ObjectIdSet());
 #endif
 }
 
@@ -77,8 +78,9 @@ TEST_F(SyncNotifierFactoryTest, Basic_P2P) {
   ASSERT_FALSE(notifier.get());
 #else
   ASSERT_TRUE(notifier.get());
-  notifier->AddObserver(&mock_observer_);
-  notifier->RemoveObserver(&mock_observer_);
+  ObjectIdSet ids = ModelTypeSetToObjectIdSet(ModelTypeSet(syncer::BOOKMARKS));
+  notifier->UpdateRegisteredIds(&mock_observer_, ids);
+  notifier->UpdateRegisteredIds(&mock_observer_, ObjectIdSet());
 #endif
 }