Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/notifier/object_id_invalidation_map.cc

Index: sync/notifier/object_id_invalidation_map.cc
diff --git a/sync/notifier/object_id_state_map.cc b/sync/notifier/object_id_invalidation_map.cc
similarity index 41%
rename from sync/notifier/object_id_state_map.cc
rename to sync/notifier/object_id_invalidation_map.cc
index c673ed803f9b4095810b29ce7588d095077f31bc..5fa253e1892fb9596dd3664f109c85b9c69b964f 100644
--- a/sync/notifier/object_id_state_map.cc
+++ b/sync/notifier/object_id_invalidation_map.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/notifier/object_id_state_map.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 
 #include <algorithm>
 
@@ -11,30 +11,31 @@
 
 namespace syncer {
 
-ObjectIdSet ObjectIdStateMapToSet(const ObjectIdStateMap& id_state_map) {
+ObjectIdSet ObjectIdInvalidationMapToSet(
+    const ObjectIdInvalidationMap& invalidation_map) {
   ObjectIdSet ids;
-  for (ObjectIdStateMap::const_iterator it = id_state_map.begin();
-       it != id_state_map.end(); ++it) {
+  for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
+       it != invalidation_map.end(); ++it) {
     ids.insert(it->first);
   }
   return ids;
 }
 
-ObjectIdStateMap ObjectIdSetToStateMap(const ObjectIdSet& ids,
-                                       const std::string& payload) {
-  ObjectIdStateMap id_state_map;
+ObjectIdInvalidationMap ObjectIdSetToInvalidationMap(
+    const ObjectIdSet& ids, const std::string& payload) {
+  ObjectIdInvalidationMap invalidation_map;
   for (ObjectIdSet::const_iterator it = ids.begin(); it != ids.end(); ++it) {
     // TODO(dcheng): Do we need to provide a way to set AckHandle?
-    id_state_map[*it].payload = payload;
+    invalidation_map[*it].payload = payload;
   }
-  return id_state_map;
+  return invalidation_map;
 }
 
 namespace {
 
-struct ObjectIdStateMapValueEquals {
-  bool operator()(const ObjectIdStateMap::value_type& value1,
-                  const ObjectIdStateMap::value_type& value2) const {
+struct ObjectIdInvalidationMapValueEquals {
+  bool operator()(const ObjectIdInvalidationMap::value_type& value1,
+                  const ObjectIdInvalidationMap::value_type& value2) const {
     return
         (value1.first == value2.first) &&
         value1.second.Equals(value2.second);
@@ -43,19 +44,21 @@ struct ObjectIdStateMapValueEquals {
 
 }  // namespace
 
-bool ObjectIdStateMapEquals(const ObjectIdStateMap& id_state_map1,
-                            const ObjectIdStateMap& id_state_map2) {
+bool ObjectIdInvalidationMapEquals(
+    const ObjectIdInvalidationMap& invalidation_map1,
+    const ObjectIdInvalidationMap& invalidation_map2) {
   return
-      (id_state_map1.size() == id_state_map2.size()) &&
-      std::equal(id_state_map1.begin(), id_state_map1.end(),
-                 id_state_map2.begin(), ObjectIdStateMapValueEquals());
+      (invalidation_map1.size() == invalidation_map2.size()) &&
+      std::equal(invalidation_map1.begin(), invalidation_map1.end(),
+                 invalidation_map2.begin(),
+                 ObjectIdInvalidationMapValueEquals());
 }
 
-scoped_ptr<base::ListValue> ObjectIdStateMapToValue(
-    const ObjectIdStateMap& id_state_map) {
+scoped_ptr<base::ListValue> ObjectIdInvalidationMapToValue(
+    const ObjectIdInvalidationMap& invalidation_map) {
   scoped_ptr<ListValue> value(new ListValue());
-  for (ObjectIdStateMap::const_iterator it = id_state_map.begin();
-       it != id_state_map.end(); ++it) {
+  for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
+       it != invalidation_map.end(); ++it) {
     DictionaryValue* entry = new DictionaryValue();
     entry->Set("objectId", ObjectIdToValue(it->first).release());
     entry->Set("state", it->second.ToValue().release());
@@ -64,57 +67,57 @@ scoped_ptr<base::ListValue> ObjectIdStateMapToValue(
   return value.Pass();
 }
 
-bool ObjectIdStateMapFromValue(const base::ListValue& value,
-                               ObjectIdStateMap* out) {
+bool ObjectIdInvalidationMapFromValue(const base::ListValue& value,
+                               ObjectIdInvalidationMap* out) {
   out->clear();
   for (base::ListValue::const_iterator it = value.begin();
        it != value.end(); ++it) {
     const base::DictionaryValue* entry = NULL;
     const base::DictionaryValue* id_value = NULL;
-    const base::DictionaryValue* state_value = NULL;
+    const base::DictionaryValue* invalidation_value = NULL;
     invalidation::ObjectId id;
-    InvalidationState state;
+    Invalidation invalidation;
     if (!(*it)->GetAsDictionary(&entry) ||
         !entry->GetDictionary("objectId", &id_value) ||
-        !entry->GetDictionary("state", &state_value) ||
+        !entry->GetDictionary("state", &invalidation_value) ||
         !ObjectIdFromValue(*id_value, &id) ||
-        !state.ResetFromValue(*state_value)) {
+        !invalidation.ResetFromValue(*invalidation_value)) {
       return false;
     }
-    ignore_result(out->insert(std::make_pair(id, state)));
+    ignore_result(out->insert(std::make_pair(id, invalidation)));
   }
   return true;
 }
 
-ModelTypeStateMap ObjectIdStateMapToModelTypeStateMap(
-    const ObjectIdStateMap& id_state_map) {
-  ModelTypeStateMap type_state_map;
-  for (ObjectIdStateMap::const_iterator it = id_state_map.begin();
-       it != id_state_map.end(); ++it) {
+ModelTypeInvalidationMap ObjectIdInvalidationMapToModelTypeInvalidationMap(
+    const ObjectIdInvalidationMap& invalidation_map) {
+  ModelTypeInvalidationMap type_invalidation_map;
+  for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
+       it != invalidation_map.end(); ++it) {
     ModelType model_type;
     if (!ObjectIdToRealModelType(it->first, &model_type)) {
       DLOG(WARNING) << "Invalid object ID: "
                     << ObjectIdToString(it->first);
       continue;
     }
-    type_state_map[model_type] = it->second;
+    type_invalidation_map[model_type] = it->second;
   }
-  return type_state_map;
+  return type_invalidation_map;
 }
 
-ObjectIdStateMap ModelTypeStateMapToObjectIdStateMap(
-    const ModelTypeStateMap& type_state_map) {
-  ObjectIdStateMap id_state_map;
-  for (ModelTypeStateMap::const_iterator it = type_state_map.begin();
-       it != type_state_map.end(); ++it) {
+ObjectIdInvalidationMap ModelTypeInvalidationMapToObjectIdInvalidationMap(
+    const ModelTypeInvalidationMap& invalidation_map) {
+  ObjectIdInvalidationMap id_invalidation_map;
+  for (ModelTypeInvalidationMap::const_iterator it = invalidation_map.begin();
+       it != invalidation_map.end(); ++it) {
     invalidation::ObjectId id;
     if (!RealModelTypeToObjectId(it->first, &id)) {
       DLOG(WARNING) << "Invalid model type " << it->first;
       continue;
     }
-    id_state_map[id] = it->second;
+    id_invalidation_map[id] = it->second;
   }
-  return id_state_map;
+  return id_invalidation_map;
 }
 
 }  // namespace syncer