Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/notifier/object_id_invalidation_map.h

Index: sync/notifier/object_id_invalidation_map.h
diff --git a/sync/notifier/object_id_state_map.h b/sync/notifier/object_id_invalidation_map.h
similarity index 29%
rename from sync/notifier/object_id_state_map.h
rename to sync/notifier/object_id_invalidation_map.h
index 1e9513e6e620146b867f73697135641389242d63..03569d8ef32d8010c6f870f24ba9c909ffc37c49 100644
--- a/sync/notifier/object_id_state_map.h
+++ b/sync/notifier/object_id_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.
 
-#ifndef SYNC_NOTIFIER_OBJECT_ID_STATE_MAP_H_
-#define SYNC_NOTIFIER_OBJECT_ID_STATE_MAP_H_
+#ifndef SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_H_
+#define SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_H_
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/base/invalidation_state.h"
-#include "sync/internal_api/public/base/model_type_state_map.h"
+#include "sync/internal_api/public/base/invalidation.h"
+#include "sync/internal_api/public/base/model_type_invalidation_map.h"
 #include "sync/notifier/invalidation_util.h"
 
 namespace base {
@@ -21,28 +21,30 @@ class ListValue;
 namespace syncer {
 
 typedef std::map<invalidation::ObjectId,
-                 InvalidationState,
-                 ObjectIdLessThan> ObjectIdStateMap;
-
-// Converts between ObjectIdStateMaps and ObjectIdSets.
-ObjectIdSet ObjectIdStateMapToSet(const ObjectIdStateMap& id_payloads);
-ObjectIdStateMap ObjectIdSetToStateMap(const ObjectIdSet& ids,
-                                       const std::string& payload);
-
-bool ObjectIdStateMapEquals(const ObjectIdStateMap& id_state_map1,
-                            const ObjectIdStateMap& id_state_map2);
-
-scoped_ptr<base::ListValue> ObjectIdStateMapToValue(
-    const ObjectIdStateMap& model_type_payloads);
-
-bool ObjectIdStateMapFromValue(const base::ListValue& value,
-                               ObjectIdStateMap* out);
-
-// Converts between ObjectIdStateMaps and ModelTypeStateMaps.
-ModelTypeStateMap ObjectIdStateMapToModelTypeStateMap(
-    const ObjectIdStateMap& id_payloads);
-ObjectIdStateMap ModelTypeStateMapToObjectIdStateMap(
-    const ModelTypeStateMap& type_payloads);
+                 Invalidation,
+                 ObjectIdLessThan> ObjectIdInvalidationMap;
+
+// Converts between ObjectIdInvalidationMaps and ObjectIdSets.
+ObjectIdSet ObjectIdInvalidationMapToSet(
+    const ObjectIdInvalidationMap& invalidation_map);
+ObjectIdInvalidationMap ObjectIdSetToInvalidationMap(
+    const ObjectIdSet& ids, const std::string& payload);
+
+bool ObjectIdInvalidationMapEquals(
+    const ObjectIdInvalidationMap& invalidation_map1,
+    const ObjectIdInvalidationMap& invalidation_map2);
+
+scoped_ptr<base::ListValue> ObjectIdInvalidationMapToValue(
+    const ObjectIdInvalidationMap& invalidation_map);
+
+bool ObjectIdInvalidationMapFromValue(const base::ListValue& value,
+                               ObjectIdInvalidationMap* out);
+
+// Converts between ObjectIdInvalidationMaps and ModelTypeInvalidationMaps.
+ModelTypeInvalidationMap ObjectIdInvalidationMapToModelTypeInvalidationMap(
+    const ObjectIdInvalidationMap& invalidation_map);
+ObjectIdInvalidationMap ModelTypeInvalidationMapToObjectIdInvalidationMap(
+    const ModelTypeInvalidationMap& invalidation_map);
 
 }  // namespace syncer