Revert r148496 "Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver"

chrome/browser/sync/glue/bridged_sync_notifier_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 "chrome/browser/sync/glue/bridged_sync_notifier.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ skipping 17 matching lines @@
 using syncer::HasModelTypes;
 
 class MockChromeSyncNotificationBridge : public ChromeSyncNotificationBridge {
  public:
   MockChromeSyncNotificationBridge(
       const Profile* profile,
       const scoped_refptr<base::SequencedTaskRunner>& sync_task_runner)
       : ChromeSyncNotificationBridge(profile, sync_task_runner) {}
   virtual ~MockChromeSyncNotificationBridge() {}
 
-  MOCK_METHOD2(UpdateRegisteredIds, void(syncer::SyncNotifierObserver*,
-                                         const syncer::ObjectIdSet&));
+  MOCK_METHOD1(AddObserver, void(syncer::SyncNotifierObserver*));
+  MOCK_METHOD1(RemoveObserver, void(syncer::SyncNotifierObserver*));
 };
 
 class MockSyncNotifier : public syncer::SyncNotifier {
  public:
   MockSyncNotifier() {}
   virtual ~MockSyncNotifier() {}
 
-  MOCK_METHOD2(UpdateRegisteredIds,
-               void(syncer::SyncNotifierObserver*, const syncer::ObjectIdSet&));
+  MOCK_METHOD1(AddObserver, void(syncer::SyncNotifierObserver*));
+  MOCK_METHOD1(RemoveObserver, void(syncer::SyncNotifierObserver*));
   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));
 };
 
 // All tests just verify that each call is passed through to the delegate, with
-// the exception of UpdateRegisteredIds, which also verifies the call is
-// forwarded to the bridge.
+// the exception of AddObserver/RemoveObserver, which also verify the observer
+// is registered with the bridge.
 class BridgedSyncNotifierTest : public testing::Test {
  public:
   BridgedSyncNotifierTest()
       : ui_thread_(BrowserThread::UI, &ui_loop_),
         mock_bridge_(&mock_profile_, ui_loop_.message_loop_proxy()),
         mock_delegate_(new MockSyncNotifier),  // Owned by bridged_notifier_.
         bridged_notifier_(&mock_bridge_, mock_delegate_) {}
   virtual ~BridgedSyncNotifierTest() {}
 
  protected:
   MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   NiceMock<ProfileMock> mock_profile_;
   StrictMock<MockChromeSyncNotificationBridge> mock_bridge_;
   MockSyncNotifier* mock_delegate_;
   BridgedSyncNotifier bridged_notifier_;
 };
 
-TEST_F(BridgedSyncNotifierTest, UpdateRegisteredIds) {
+TEST_F(BridgedSyncNotifierTest, AddObserver) {
   syncer::MockSyncNotifierObserver observer;
-  EXPECT_CALL(mock_bridge_, UpdateRegisteredIds(
-      &observer, syncer::ObjectIdSet()));
-  EXPECT_CALL(*mock_delegate_, UpdateRegisteredIds(
-      &observer, syncer::ObjectIdSet()));
-  bridged_notifier_.UpdateRegisteredIds(&observer, syncer::ObjectIdSet());
+  EXPECT_CALL(mock_bridge_, AddObserver(&observer));
+  EXPECT_CALL(*mock_delegate_, AddObserver(&observer));
+  bridged_notifier_.AddObserver(&observer);
+}
+
+TEST_F(BridgedSyncNotifierTest, RemoveObserver) {
+  syncer::MockSyncNotifierObserver observer;
+  EXPECT_CALL(mock_bridge_, RemoveObserver(&observer));
+  EXPECT_CALL(*mock_delegate_, RemoveObserver(&observer));
+  bridged_notifier_.RemoveObserver(&observer);
 }
 
 TEST_F(BridgedSyncNotifierTest, SetUniqueId) {
   std::string unique_id = "unique id";
   EXPECT_CALL(*mock_delegate_, SetUniqueId(unique_id));
   bridged_notifier_.SetUniqueId(unique_id);
 }
 
 TEST_F(BridgedSyncNotifierTest, SetStateDeprecated) {
   std::string state = "state";
   EXPECT_CALL(*mock_delegate_, SetStateDeprecated(state));
   bridged_notifier_.SetStateDeprecated(state);
 }
 
 TEST_F(BridgedSyncNotifierTest, UpdateCredentials) {
   std::string email = "email";
   std::string token = "token";
   EXPECT_CALL(*mock_delegate_, UpdateCredentials(email, token));
   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)));
   bridged_notifier_.SendNotification(changed_types);
 }
 
 }  // namespace
 }  // namespace browser_sync