Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/internal_api/public/base/model_type_invalidation_map.h

Index: sync/internal_api/public/base/model_type_invalidation_map.h
diff --git a/sync/internal_api/public/base/model_type_state_map.h b/sync/internal_api/public/base/model_type_invalidation_map.h
similarity index 38%
rename from sync/internal_api/public/base/model_type_state_map.h
rename to sync/internal_api/public/base/model_type_invalidation_map.h
index 5a9f84d6fc40eab3c30726d9533ef8512e3a3895..7cc4a142a49834f1972e9fd001674c6bbe97a769 100644
--- a/sync/internal_api/public/base/model_type_state_map.h
+++ b/sync/internal_api/public/base/model_type_invalidation_map.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Definition of ModelTypeStateMap and various utility functions.
+// Definition of ModelTypeInvalidationMap and various utility functions.
 
-#ifndef SYNC_INTERNAL_PUBLIC_API_BASE_MODEL_TYPE_STATE_MAP_H_
-#define SYNC_INTERNAL_PUBLIC_API_BASE_MODEL_TYPE_STATE_MAP_H_
+#ifndef SYNC_INTERNAL_PUBLIC_API_BASE_MODEL_TYPE_INVALIDATION_MAP_H_
+#define SYNC_INTERNAL_PUBLIC_API_BASE_MODEL_TYPE_INVALIDATION_MAP_H_
 
 #include <map>
 #include <string>
 
 #include "sync/base/sync_export.h"
-#include "sync/internal_api/public/base/invalidation_state.h"
+#include "sync/internal_api/public/base/invalidation.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 // TODO(akalin): Move the non-exported functions in this file to a
@@ -23,32 +23,31 @@ class DictionaryValue;
 
 namespace syncer {
 
-// A container that contains a set of datatypes with possible string
-// payloads.
-typedef std::map<ModelType, InvalidationState> ModelTypeStateMap;
+// A map between sync data types and their associated invalidation.
+typedef std::map<ModelType, Invalidation> ModelTypeInvalidationMap;
 
-// Helper functions for building ModelTypeStateMaps.
+// Helper functions for building ModelTypeInvalidationMaps.
 
-// Make a TypeStateMap from all the types in a ModelTypeSet using a
+// Make a ModelTypeInvalidationMap from all the types in a ModelTypeSet using a
 // default payload.
-SYNC_EXPORT ModelTypeStateMap ModelTypeSetToStateMap(
+SYNC_EXPORT ModelTypeInvalidationMap ModelTypeSetToInvalidationMap(
     ModelTypeSet model_types, const std::string& payload);
 
-ModelTypeSet ModelTypeStateMapToSet(
-    const ModelTypeStateMap& type_state_map);
+ModelTypeSet ModelTypeInvalidationMapToSet(
+    const ModelTypeInvalidationMap& invalidation_map);
 
-std::string ModelTypeStateMapToString(
-    const ModelTypeStateMap& type_state_map);
+std::string ModelTypeInvalidationMapToString(
+    const ModelTypeInvalidationMap& invalidation_map);
 
 // Caller takes ownership of the returned dictionary.
-base::DictionaryValue* ModelTypeStateMapToValue(
-    const ModelTypeStateMap& type_state_map);
+base::DictionaryValue* ModelTypeInvalidationMapToValue(
+    const ModelTypeInvalidationMap& invalidation_map);
 
 // Coalesce |update| into |original|, overwriting only when |update| has
 // a non-empty payload.
-void CoalesceStates(ModelTypeStateMap* original,
-                    const ModelTypeStateMap& update);
+void CoalesceStates(ModelTypeInvalidationMap* original,
+                    const ModelTypeInvalidationMap& update);
 
 }  // namespace syncer
 
-#endif  // SYNC_INTERNAL_PUBLIC_API_BASE_MODEL_TYPE_STATE_MAP_H_
+#endif  // SYNC_INTERNAL_PUBLIC_API_BASE_MODEL_TYPE_INVALIDATION_MAP_H_