Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc

Index: chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc
diff --git a/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc b/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc
index e45ddf3dd77296481bbd9b4ea9e96de00c6187c1..5b870175cd21c38726915544185e913be3cc0c82 100644
--- a/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc
+++ b/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc
@@ -44,12 +44,12 @@ class MockSyncNotifier : public syncer::SyncNotifier {
   MockSyncNotifier() {}
   virtual ~MockSyncNotifier() {}
 
-  MOCK_METHOD1(AddObserver, void(syncer::SyncNotifierObserver*));
-  MOCK_METHOD1(RemoveObserver, void(syncer::SyncNotifierObserver*));
+  MOCK_METHOD1(AddHandler, void(syncer::SyncNotifierObserver*));
+  MOCK_METHOD1(RemoveHandler, void(syncer::SyncNotifierObserver*));
+  MOCK_METHOD0(ReloadHandlers, void());
   MOCK_METHOD1(SetUniqueId, void(const std::string&));
   MOCK_METHOD1(SetStateDeprecated, void(const std::string&));
   MOCK_METHOD2(UpdateCredentials, void(const std::string&, const std::string&));
-  MOCK_METHOD1(UpdateEnabledTypes, void(syncer::ModelTypeSet));
   MOCK_METHOD1(SendNotification, void(syncer::ModelTypeSet));
 };
 
@@ -75,15 +75,20 @@ class BridgedSyncNotifierTest : public testing::Test {
 TEST_F(BridgedSyncNotifierTest, AddObserver) {
   syncer::MockSyncNotifierObserver observer;
   EXPECT_CALL(mock_bridge_, AddObserver(&observer));
-  EXPECT_CALL(*mock_delegate_, AddObserver(&observer));
-  bridged_notifier_.AddObserver(&observer);
+  EXPECT_CALL(*mock_delegate_, AddHandler(&observer));
+  bridged_notifier_.AddHandler(&observer);
 }
 
 TEST_F(BridgedSyncNotifierTest, RemoveObserver) {
   syncer::MockSyncNotifierObserver observer;
   EXPECT_CALL(mock_bridge_, RemoveObserver(&observer));
-  EXPECT_CALL(*mock_delegate_, RemoveObserver(&observer));
-  bridged_notifier_.RemoveObserver(&observer);
+  EXPECT_CALL(*mock_delegate_, RemoveHandler(&observer));
+  bridged_notifier_.RemoveHandler(&observer);
+}
+
+TEST_F(BridgedSyncNotifierTest, ReloadHandlers) {
+  EXPECT_CALL(*mock_delegate_, ReloadHandlers());
+  bridged_notifier_.ReloadHandlers();
 }
 
 TEST_F(BridgedSyncNotifierTest, SetUniqueId) {
@@ -105,13 +110,6 @@ TEST_F(BridgedSyncNotifierTest, UpdateCredentials) {
   bridged_notifier_.UpdateCredentials(email, token);
 }
 
-TEST_F(BridgedSyncNotifierTest, UpdateEnabledTypes) {
-  syncer::ModelTypeSet enabled_types(syncer::BOOKMARKS, syncer::PREFERENCES);
-  EXPECT_CALL(*mock_delegate_,
-              UpdateEnabledTypes(HasModelTypes(enabled_types)));
-  bridged_notifier_.UpdateEnabledTypes(enabled_types);
-}
-
 TEST_F(BridgedSyncNotifierTest, SendNotification) {
   syncer::ModelTypeSet changed_types(syncer::SESSIONS, syncer::EXTENSIONS);
   EXPECT_CALL(*mock_delegate_, SendNotification(HasModelTypes(changed_types)));