Rename ModelType/ObjectIdStateMap to InvalidationMap.

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 95f53af9b1880dcd148eef07a30700ae1a27c2a9..4dc2b1bde10a904066ce3595fb63121eb104ba84 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -479,9 +479,9 @@ void ProfileSyncService::EmitInvalidationForTest(
   syncer::ObjectIdSet notify_ids;
   notify_ids.insert(id);
 
-  const syncer::ObjectIdStateMap& id_state_map =
-      ObjectIdSetToStateMap(notify_ids, payload);
-  OnIncomingInvalidation(id_state_map, syncer::REMOTE_INVALIDATION);
+  const syncer::ObjectIdInvalidationMap& invalidation_map =
+      ObjectIdSetToInvalidationMap(notify_ids, payload);
+  OnIncomingInvalidation(invalidation_map, syncer::REMOTE_INVALIDATION);
 }
 
 void ProfileSyncService::Shutdown() {
@@ -682,9 +682,10 @@ void ProfileSyncService::OnInvalidatorStateChange(
 }
 
 void ProfileSyncService::OnIncomingInvalidation(
-    const syncer::ObjectIdStateMap& id_state_map,
+    const syncer::ObjectIdInvalidationMap& invalidation_map,
     syncer::IncomingInvalidationSource source) {
-  invalidator_registrar_.DispatchInvalidationsToHandlers(id_state_map, source);
+  invalidator_registrar_.DispatchInvalidationsToHandlers(invalidation_map,
+                                                         source);
 }
 
 void ProfileSyncService::OnBackendInitialized(