Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

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 ae2922d0f3bff13b335281b10923f1660c07b70f..c18507d7e7e56e42be387c5f48836839436d31c1 100644
--- a/sync/sessions/sync_session_unittest.cc
+++ b/sync/sessions/sync_session_unittest.cc
@@ -272,12 +272,12 @@ TEST_F(SyncSessionTest, ResetTransientState) {
 TEST_F(SyncSessionTest, Coalesce) {
   std::vector<ModelSafeWorker*> workers_one, workers_two;
   ModelSafeRoutingInfo routes_one, routes_two;
-  ModelTypePayloadMap one_type =
-      ModelTypePayloadMapFromEnumSet(
+  ModelTypeStateMap one_type =
+      ModelTypeStateMapFromEnumSet(
           ParamsMeaningJustOneEnabledType(),
           std::string());
-  ModelTypePayloadMap all_types =
-      ModelTypePayloadMapFromEnumSet(
+  ModelTypeStateMap all_types =
+      ModelTypeStateMapFromEnumSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
@@ -329,12 +329,12 @@ TEST_F(SyncSessionTest, Coalesce) {
 TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
   std::vector<ModelSafeWorker*> workers_one, workers_two;
   ModelSafeRoutingInfo routes_one, routes_two;
-  ModelTypePayloadMap one_type =
-      ModelTypePayloadMapFromEnumSet(
+  ModelTypeStateMap one_type =
+      ModelTypeStateMapFromEnumSet(
           ParamsMeaningJustOneEnabledType(),
           std::string());
-  ModelTypePayloadMap all_types =
-      ModelTypePayloadMapFromEnumSet(
+  ModelTypeStateMap all_types =
+      ModelTypeStateMapFromEnumSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_one(sync_pb::GetUpdatesCallerInfo::PERIODIC, one_type);
@@ -401,8 +401,8 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestRemoveOneType) {
 TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
   std::vector<ModelSafeWorker*> workers_first, workers_second;
   ModelSafeRoutingInfo routes_first, routes_second;
-  ModelTypePayloadMap all_types =
-      ModelTypePayloadMapFromEnumSet(
+  ModelTypeStateMap all_types =
+      ModelTypeStateMapFromEnumSet(
           ParamsMeaningAllEnabledTypes(),
           std::string());
   SyncSourceInfo source_first(sync_pb::GetUpdatesCallerInfo::PERIODIC,
@@ -481,23 +481,23 @@ TEST_F(SyncSessionTest, RebaseRoutingInfoWithLatestWithSameType) {
 }
 
 
-TEST_F(SyncSessionTest, MakeTypePayloadMapFromBitSet) {
+TEST_F(SyncSessionTest, MakeTypeStateMapFromBitSet) {
   ModelTypeSet types;
   std::string payload = "test";
-  ModelTypePayloadMap types_with_payloads =
-      ModelTypePayloadMapFromEnumSet(types, payload);
-  EXPECT_TRUE(types_with_payloads.empty());
+  ModelTypeStateMap type_state_map =
+      ModelTypeStateMapFromEnumSet(types, payload);
+  EXPECT_TRUE(type_state_map.empty());
 
   types.Put(BOOKMARKS);
   types.Put(PASSWORDS);
   types.Put(AUTOFILL);
   payload = "test2";
-  types_with_payloads = ModelTypePayloadMapFromEnumSet(types, payload);
+  type_state_map = ModelTypeStateMapFromEnumSet(types, payload);
 
-  ASSERT_EQ(3U, types_with_payloads.size());
-  EXPECT_EQ(types_with_payloads[BOOKMARKS], payload);
-  EXPECT_EQ(types_with_payloads[PASSWORDS], payload);
-  EXPECT_EQ(types_with_payloads[AUTOFILL], 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);
 }
 
 }  // namespace