Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

chrome/browser/sync/glue/chrome_sync_notification_bridge_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/chrome_sync_notification_bridge.h"
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 30 matching lines @@
     : public syncer::SyncNotifierObserver {
  public:
   FakeSyncNotifierObserverIO(
       ChromeSyncNotificationBridge* bridge,
       const syncer::ModelTypePayloadMap& expected_payloads)
       : bridge_(bridge),
         received_improper_notification_(false),
         notification_count_(0),
         expected_payloads_(expected_payloads) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    bridge_->AddObserver(this);
+    bridge_->UpdateRegisteredIds(
+        this, ModelTypeSetToObjectIdSet(
+            ModelTypePayloadMapToEnumSet(expected_payloads)));
   }
   virtual ~FakeSyncNotifierObserverIO() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    bridge_->RemoveObserver(this);
+    bridge_->UpdateRegisteredIds(this, syncer::ObjectIdSet());
   }
 
   // SyncNotifierObserver implementation.
   virtual void OnIncomingNotification(
-      const syncer::ModelTypePayloadMap& type_payloads,
+      const syncer::ObjectIdPayloadMap& id_payloads,
       syncer::IncomingNotificationSource source) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     notification_count_++;
     if (source != syncer::LOCAL_NOTIFICATION) {
       LOG(ERROR) << "Received notification with wrong source.";
       received_improper_notification_ = true;
     }
-    if (expected_payloads_ != type_payloads) {
+    const syncer::ModelTypePayloadMap& actual_payloads =
+        syncer::ObjectIdPayloadMapToModelTypePayloadMap(id_payloads);
+    if (expected_payloads_ != actual_payloads) {
       LOG(ERROR) << "Received wrong payload.";
       received_improper_notification_ = true;
     }
   }
   virtual void OnNotificationsEnabled() OVERRIDE {
     NOTREACHED();
   }
   virtual void OnNotificationsDisabled(
       syncer::NotificationsDisabledReason reason) OVERRIDE {
     NOTREACHED();
@@ skipping 104 matching lines @@
   // Created/used/destroyed on I/O thread.
   FakeSyncNotifierObserverIO* io_observer_;
   bool io_observer_notification_failure_;
   ChromeSyncNotificationBridge bridge_;
   base::WaitableEvent done_;
 };
 
 // Adds an observer on the UI thread, triggers a local refresh notification, and
 // ensures the bridge posts a LOCAL_NOTIFICATION with the proper payload to it.
 TEST_F(ChromeSyncNotificationBridgeTest, LocalNotification) {
-  syncer::ModelTypePayloadMap payload_map;
-  payload_map[syncer::SESSIONS] = "";
+  syncer::ModelTypeSet models(syncer::SESSIONS);
+  syncer::ModelTypePayloadMap payload_map =
+      ModelTypePayloadMapFromEnumSet(models, "payload");
   StrictMock<syncer::MockSyncNotifierObserver> observer;
-  EXPECT_CALL(observer,
-              OnIncomingNotification(payload_map,
-                                     syncer::LOCAL_NOTIFICATION));
-  bridge_.AddObserver(&observer);
+  EXPECT_CALL(observer, OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(payload_map),
+      syncer::LOCAL_NOTIFICATION));
+  bridge_.UpdateRegisteredIds(&observer, ModelTypeSetToObjectIdSet(models));
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
                              payload_map);
   ui_loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 }
 
 // Adds an observer on the UI thread, triggers a remote refresh notification,
 // and ensures the bridge posts a REMOTE_NOTIFICATION with the proper payload
 // to it.
 TEST_F(ChromeSyncNotificationBridgeTest, RemoteNotification) {
-  syncer::ModelTypePayloadMap payload_map;
-  payload_map[syncer::BOOKMARKS] = "";
+  syncer::ModelTypeSet models(syncer::BOOKMARKS);
+  syncer::ModelTypePayloadMap payload_map =
+      ModelTypePayloadMapFromEnumSet(models, "payload");
   StrictMock<syncer::MockSyncNotifierObserver> observer;
-  EXPECT_CALL(observer,
-              OnIncomingNotification(payload_map,
-                                     syncer::REMOTE_NOTIFICATION));
-  bridge_.AddObserver(&observer);
+  EXPECT_CALL(observer, OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(payload_map),
+      syncer::REMOTE_NOTIFICATION));
+  bridge_.UpdateRegisteredIds(&observer, ModelTypeSetToObjectIdSet(models));
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
                              payload_map);
   ui_loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 }
 
 // Adds an observer on the UI thread, triggers a local refresh notification
 // with empty payload map and ensures the bridge posts a
 // LOCAL_NOTIFICATION with the proper payload to it.
 TEST_F(ChromeSyncNotificationBridgeTest, LocalNotificationEmptyPayloadMap) {
   const syncer::ModelTypeSet enabled_types(
       syncer::BOOKMARKS, syncer::PASSWORDS);
   const syncer::ModelTypePayloadMap enabled_types_payload_map =
       syncer::ModelTypePayloadMapFromEnumSet(enabled_types, std::string());
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
-  EXPECT_CALL(observer,
-              OnIncomingNotification(enabled_types_payload_map,
-                                     syncer::LOCAL_NOTIFICATION));
-  bridge_.AddObserver(&observer);
+  EXPECT_CALL(observer, OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(enabled_types_payload_map),
+      syncer::LOCAL_NOTIFICATION));
+  bridge_.UpdateRegisteredIds(&observer,
+                              ModelTypeSetToObjectIdSet(enabled_types));
   // Set enabled types on the bridge.
   bridge_.UpdateEnabledTypes(enabled_types);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
                              syncer::ModelTypePayloadMap());
   ui_loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 }
 
 // Adds an observer on the UI thread, triggers a remote refresh notification
 // with empty payload map and ensures the bridge posts a
 // REMOTE_NOTIFICATION with the proper payload to it.
 TEST_F(ChromeSyncNotificationBridgeTest, RemoteNotificationEmptyPayloadMap) {
   const syncer::ModelTypeSet enabled_types(
       syncer::BOOKMARKS, syncer::TYPED_URLS);
   const syncer::ModelTypePayloadMap enabled_types_payload_map =
       syncer::ModelTypePayloadMapFromEnumSet(enabled_types, std::string());
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
-  EXPECT_CALL(observer,
-              OnIncomingNotification(enabled_types_payload_map,
-                                     syncer::REMOTE_NOTIFICATION));
-  bridge_.AddObserver(&observer);
+  EXPECT_CALL(observer, OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(enabled_types_payload_map),
+      syncer::REMOTE_NOTIFICATION));
+  bridge_.UpdateRegisteredIds(&observer,
+                              ModelTypeSetToObjectIdSet(enabled_types));
   // Set enabled types on the bridge.
   bridge_.UpdateEnabledTypes(enabled_types);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
                              syncer::ModelTypePayloadMap());
   ui_loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
 }
 
 // Adds an observer on the I/O thread. Then triggers a refresh notification on
 // the UI thread. We finally verify the proper notification was received by the
 // observer and destroy it on the I/O thread.
 TEST_F(ChromeSyncNotificationBridgeTest, BasicThreaded) {
   syncer::ModelTypePayloadMap payload_map;
   payload_map[syncer::SESSIONS] = "";
   CreateObserverWithExpectedPayload(payload_map);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
                              payload_map);
   VerifyAndDestroyObserver();
 }
 
 }  // namespace
 }  // namespace browser_sync