Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

chrome/browser/sync/glue/chrome_sync_notification_bridge.cc

Index: chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
diff --git a/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc b/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
index 9936fa08f020e93b0eff6fe86a1dcbecc3f81db8..c431d0e8779b2448fb3c109017f314e85e7f5297 100644
--- a/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
+++ b/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
@@ -7,6 +7,7 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
+#include "sync/internal_api/public/base/model_type_payload_map.h"
 #include "sync/notifier/sync_notifier_observer.h"
 
 using content::BrowserThread;
@@ -69,9 +70,11 @@ void ChromeSyncNotificationBridge::Observe(
         syncer::ModelTypePayloadMapFromEnumSet(enabled_types_, std::string());
   }
 
+  // TODO(dcheng): I'm not entirely sure this is the right fix.
   observers_->Notify(
       &syncer::SyncNotifierObserver::OnIncomingNotification,
-      payload_map, notification_source);
+      ModelTypePayloadMapToObjectIdPayloadMap(payload_map),
+      notification_source);
 }
 
 }  // namespace browser_sync