Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc

Index: chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
diff --git a/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc b/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
index ffd42fd6eea1e76ee1bbe028c166f802de0ecf31..978357724942570b3c7c6ed3001eb7108d79331b 100644
--- a/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
+++ b/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
@@ -56,8 +56,13 @@ class FakeSyncNotifierObserverIO
   }
 
   // SyncNotifierObserver implementation.
+  virtual syncer::ObjectIdSet GetHandledIds() OVERRIDE {
+    NOTREACHED();
+    return syncer::ObjectIdSet();
+  }
+
   virtual void OnIncomingNotification(
-      const syncer::ModelTypePayloadMap& type_payloads,
+      const syncer::ObjectIdPayloadMap& id_payloads,
       syncer::IncomingNotificationSource source) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     notification_count_++;
@@ -65,7 +70,9 @@ class FakeSyncNotifierObserverIO
       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;
     }
@@ -193,9 +200,9 @@ TEST_F(ChromeSyncNotificationBridgeTest, LocalNotification) {
   syncer::ModelTypePayloadMap payload_map;
   payload_map[syncer::SESSIONS] = "";
   StrictMock<syncer::MockSyncNotifierObserver> observer;
-  EXPECT_CALL(observer,
-              OnIncomingNotification(payload_map,
-                                     syncer::LOCAL_NOTIFICATION));
+  EXPECT_CALL(observer, OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(payload_map),
+      syncer::LOCAL_NOTIFICATION));
   bridge_.AddObserver(&observer);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
                              payload_map);
@@ -210,9 +217,9 @@ TEST_F(ChromeSyncNotificationBridgeTest, RemoteNotification) {
   syncer::ModelTypePayloadMap payload_map;
   payload_map[syncer::BOOKMARKS] = "";
   StrictMock<syncer::MockSyncNotifierObserver> observer;
-  EXPECT_CALL(observer,
-              OnIncomingNotification(payload_map,
-                                     syncer::REMOTE_NOTIFICATION));
+  EXPECT_CALL(observer, OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(payload_map),
+      syncer::REMOTE_NOTIFICATION));
   bridge_.AddObserver(&observer);
   TriggerRefreshNotification(chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
                              payload_map);
@@ -230,9 +237,9 @@ TEST_F(ChromeSyncNotificationBridgeTest, LocalNotificationEmptyPayloadMap) {
       syncer::ModelTypePayloadMapFromEnumSet(enabled_types, std::string());
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
-  EXPECT_CALL(observer,
-              OnIncomingNotification(enabled_types_payload_map,
-                                     syncer::LOCAL_NOTIFICATION));
+  EXPECT_CALL(observer, OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(enabled_types_payload_map),
+      syncer::LOCAL_NOTIFICATION));
   bridge_.AddObserver(&observer);
   // Set enabled types on the bridge.
   bridge_.UpdateEnabledTypes(enabled_types);
@@ -252,9 +259,9 @@ TEST_F(ChromeSyncNotificationBridgeTest, RemoteNotificationEmptyPayloadMap) {
       syncer::ModelTypePayloadMapFromEnumSet(enabled_types, std::string());
 
   StrictMock<syncer::MockSyncNotifierObserver> observer;
-  EXPECT_CALL(observer,
-              OnIncomingNotification(enabled_types_payload_map,
-                                     syncer::REMOTE_NOTIFICATION));
+  EXPECT_CALL(observer, OnIncomingNotification(
+      ModelTypePayloadMapToObjectIdPayloadMap(enabled_types_payload_map),
+      syncer::REMOTE_NOTIFICATION));
   bridge_.AddObserver(&observer);
   // Set enabled types on the bridge.
   bridge_.UpdateEnabledTypes(enabled_types);