Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

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 038d4f2b0f3bcd04066b81f6f01b444257b19685..dfd3e1f96a2ea6912f2034d4c561594631a30ee2 100644
--- a/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
+++ b/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
@@ -37,7 +37,7 @@ class ChromeSyncNotificationBridge::Core
   void UnregisterHandler(syncer::SyncNotifierObserver* handler);
 
   void EmitNotification(
-      const syncer::ModelTypePayloadMap& payload_map,
+      const syncer::ModelTypeStateMap& state_map,
       syncer::IncomingNotificationSource notification_source);
 
  private:
@@ -100,16 +100,16 @@ void ChromeSyncNotificationBridge::Core::UnregisterHandler(
 }
 
 void ChromeSyncNotificationBridge::Core::EmitNotification(
-    const syncer::ModelTypePayloadMap& payload_map,
+    const syncer::ModelTypeStateMap& state_map,
     syncer::IncomingNotificationSource notification_source) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
-  const syncer::ModelTypePayloadMap& effective_payload_map =
-      payload_map.empty() ?
-      syncer::ModelTypePayloadMapFromEnumSet(enabled_types_, std::string()) :
-      payload_map;
+  const syncer::ModelTypeStateMap& effective_state_map =
+      state_map.empty() ?
+      syncer::ModelTypeSetToStateMap(enabled_types_, std::string()) :
+      state_map;
 
   notifier_registrar_->DispatchInvalidationsToHandlers(
-      ModelTypePayloadMapToObjectIdPayloadMap(effective_payload_map),
+      ModelTypeStateMapToObjectIdStateMap(effective_state_map),
       notification_source);
 }
 
@@ -181,13 +181,13 @@ void ChromeSyncNotificationBridge::Observe(
     return;
   }
 
-  content::Details<const syncer::ModelTypePayloadMap>
-      payload_details(details);
-  const syncer::ModelTypePayloadMap& payload_map = *(payload_details.ptr());
+  content::Details<const syncer::ModelTypeStateMap>
+      state_details(details);
+  const syncer::ModelTypeStateMap& state_map = *(state_details.ptr());
   if (!sync_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&Core::EmitNotification,
-                     core_, payload_map, notification_source))) {
+                     core_, state_map, notification_source))) {
     NOTREACHED();
   }
 }