Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

chrome/browser/sync/glue/chrome_sync_notification_bridge.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 "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;
 
 namespace browser_sync {
 
 ChromeSyncNotificationBridge::ChromeSyncNotificationBridge(
     const Profile* profile)
     : observers_(
         new ObserverListThreadSafe<syncer::SyncNotifierObserver>()) {
@@ skipping 42 matching lines @@
   content::Details<const syncer::ModelTypePayloadMap>
       payload_details(details);
   syncer::ModelTypePayloadMap payload_map = *(payload_details.ptr());
 
   if (payload_map.empty()) {
     // No model types to invalidate, invalidating all enabled types.
     payload_map =
         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