Rename ModelType/ObjectIdStateMap to InvalidationMap.

sync/sessions/sync_session_unittest.cc

Index: sync/sessions/sync_session_unittest.cc
diff --git a/sync/sessions/sync_session_unittest.cc b/sync/sessions/sync_session_unittest.cc
index bc69fe87588f615a9cc8846a4e395b8301c6722c..d187ce66bbcf1e0a12523e8a45f6b31c8222ec67 100644
--- a/sync/sessions/sync_session_unittest.cc
+++ b/sync/sessions/sync_session_unittest.cc
@@ -12,7 +12,7 @@
 #include "sync/engine/syncer_types.h"
 #include "sync/engine/throttled_data_type_tracker.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/base/model_type_state_map_test_util.h"
+#include "sync/internal_api/public/base/model_type_invalidation_map_test_util.h"
 #include "sync/sessions/session_state.h"
 #include "sync/sessions/status_controller.h"
 #include "sync/syncable/syncable_id.h"
@@ -273,12 +273,12 @@ TEST_F(SyncSessionTest, ResetTransientState) {
 TEST_F(SyncSessionTest, Coalesce) {
   std::vector<ModelSafeWorker*> workers_one, workers_two;
   ModelSafeRoutingInfo routes_one, routes_two;
-  ModelTypeStateMap one_type =
-      ModelTypeSetToStateMap(
+  ModelTypeInvalidationMap one_type =
+      ModelTypeSetToInvalidationMap(
           ParamsMeaningJustOneEnabledType(),
           std::string());
-  ModelTypeStateMap all_types =
-      ModelTypeSetToStateMap(
+  ModelTypeInvalidationMap all_types =
+      ModelTypeSetToInvalidationMap(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
@@ -330,12 +330,12 @@ TEST_F(SyncSessionTest, Coalesce) {
 TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
   std::vector<ModelSafeWorker*> workers_one, workers_two;
   ModelSafeRoutingInfo routes_one, routes_two;
-  ModelTypeStateMap one_type =
-      ModelTypeSetToStateMap(
+  ModelTypeInvalidationMap one_type =
+      ModelTypeSetToInvalidationMap(
           ParamsMeaningJustOneEnabledType(),
           std::string());
-  ModelTypeStateMap all_types =
-      ModelTypeSetToStateMap(
+  ModelTypeInvalidationMap all_types =
+      ModelTypeSetToInvalidationMap(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
@@ -402,8 +402,8 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
 TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
   std::vector<ModelSafeWorker*> workers_first, workers_second;
   ModelSafeRoutingInfo routes_first, routes_second;
-  ModelTypeStateMap all_types =
-      ModelTypeSetToStateMap(
+  ModelTypeInvalidationMap all_types =
+      ModelTypeSetToInvalidationMap(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_first(sync_pb::GetUpdatesCallerInfo::PERIODIC,
@@ -482,23 +482,23 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
 }
 
 
-TEST_F(SyncSessionTest, MakeTypeStateMapFromBitSet) {
+TEST_F(SyncSessionTest, MakeTypeInvalidationMapFromBitSet) {
   ModelTypeSet types;
   std::string payload = "test";
-  ModelTypeStateMap type_state_map =
-      ModelTypeSetToStateMap(types, payload);
-  EXPECT_TRUE(type_state_map.empty());
+  ModelTypeInvalidationMap invalidation_map =
+      ModelTypeSetToInvalidationMap(types, payload);
+  EXPECT_TRUE(invalidation_map.empty());
 
   types.Put(BOOKMARKS);
   types.Put(PASSWORDS);
   types.Put(AUTOFILL);
   payload = "test2";
-  type_state_map = ModelTypeSetToStateMap(types, payload);
+  invalidation_map = ModelTypeSetToInvalidationMap(types, payload);
 
-  ASSERT_EQ(3U, type_state_map.size());
-  EXPECT_EQ(type_state_map[BOOKMARKS].payload, payload);
-  EXPECT_EQ(type_state_map[PASSWORDS].payload, payload);
-  EXPECT_EQ(type_state_map[AUTOFILL].payload, payload);
+  ASSERT_EQ(3U, invalidation_map.size());
+  EXPECT_EQ(invalidation_map[BOOKMARKS].payload, payload);
+  EXPECT_EQ(invalidation_map[PASSWORDS].payload, payload);
+  EXPECT_EQ(invalidation_map[AUTOFILL].payload, payload);
 }
 
 }  // namespace