Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/internal_api/sync_manager_impl.h

Index: sync/internal_api/sync_manager_impl.h
diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
index 7b2a6c45dc297d142e2620249e09479418da2148..b0ed231b2016a2a434d49b8be8ae5280b9627013 100644
--- a/sync/internal_api/sync_manager_impl.h
+++ b/sync/internal_api/sync_manager_impl.h
@@ -171,7 +171,7 @@ class SyncManagerImpl : public SyncManager,
   virtual void OnNotificationsDisabled(
       NotificationsDisabledReason reason) OVERRIDE;
   virtual void OnIncomingNotification(
-      const ObjectIdPayloadMap& id_payloads,
+      const ObjectIdStateMap& id_state_map,
       IncomingNotificationSource source) OVERRIDE;
 
   // Called only by our NetworkChangeNotifier.
@@ -255,7 +255,7 @@ class SyncManagerImpl : public SyncManager,
   // Called for every notification. This updates the notification statistics
   // to be displayed in about:sync.
   void UpdateNotificationInfo(
-      const ModelTypePayloadMap& type_payloads);
+      const ModelTypeStateMap& type_state_map);
 
   // Checks for server reachabilty and requests a nudge.
   void OnIPAddressChangedImpl();