Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/internal_api/public/engine/model_safe_worker_unittest.cc

Index: sync/internal_api/public/engine/model_safe_worker_unittest.cc
diff --git a/sync/internal_api/public/engine/model_safe_worker_unittest.cc b/sync/internal_api/public/engine/model_safe_worker_unittest.cc
index 9c65894b3cec10e441609a081ee6409ab2b14a0c..f879109d3e12ad9496f4967fd0827fd9284ef1b7 100644
--- a/sync/internal_api/public/engine/model_safe_worker_unittest.cc
+++ b/sync/internal_api/public/engine/model_safe_worker_unittest.cc
@@ -48,19 +48,19 @@ TEST_F(ModelSafeWorkerTest, GetRoutingInfoTypes) {
   EXPECT_TRUE(GetRoutingInfoTypes(routing_info).Equals(expected_types));
 }
 
-TEST_F(ModelSafeWorkerTest, ModelSafeRoutingInfoToStateMap) {
+TEST_F(ModelSafeWorkerTest, ModelSafeRoutingInfoToInvalidationMap) {
   std::string payload = "test";
   ModelSafeRoutingInfo routing_info;
   routing_info[BOOKMARKS] = GROUP_PASSIVE;
   routing_info[NIGORI] = GROUP_UI;
   routing_info[PREFERENCES] = GROUP_DB;
-  ModelTypeStateMap type_state_map =
-      ModelSafeRoutingInfoToStateMap(routing_info, payload);
-  ASSERT_EQ(routing_info.size(), type_state_map.size());
+  ModelTypeInvalidationMap invalidation_map =
+      ModelSafeRoutingInfoToInvalidationMap(routing_info, payload);
+  ASSERT_EQ(routing_info.size(), invalidation_map.size());
   for (ModelSafeRoutingInfo::iterator iter = routing_info.begin();
        iter != routing_info.end();
        ++iter) {
-    EXPECT_EQ(payload, type_state_map[iter->first].payload);
+    EXPECT_EQ(payload, invalidation_map[iter->first].payload);
   }
 }