Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/sessions/session_state_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/sessions/session_state.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 12 matching lines @@
 using base::ExpectDictDictionaryValue;
 using base::ExpectDictIntegerValue;
 using base::ExpectDictListValue;
 using base::ExpectDictStringValue;
 
 class SessionStateTest : public testing::Test {};
 
 TEST_F(SessionStateTest, SyncSourceInfoToValue) {
   sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source =
       sync_pb::GetUpdatesCallerInfo::PERIODIC;
-  ModelTypePayloadMap types;
-  types[PREFERENCES] = "preferencespayload";
-  types[EXTENSIONS] = "";
+  ModelTypeStateMap types;
+  types[PREFERENCES].payload = "preferencespayload";
+  types[EXTENSIONS].payload = "";
   scoped_ptr<DictionaryValue> expected_types_value(
-      ModelTypePayloadMapToValue(types));
+      ModelTypeStateMapToValue(types));
 
   SyncSourceInfo source_info(updates_source, types);
 
   scoped_ptr<DictionaryValue> value(source_info.ToValue());
   EXPECT_EQ(2u, value->size());
   ExpectDictStringValue("PERIODIC", *value, "updatesSource");
   ExpectDictDictionaryValue(*expected_types_value, *value, "types");
 }
 
 TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
   ModelNeutralState model_neutral;
   model_neutral.num_server_changes_remaining = 105;
   model_neutral.num_successful_commits = 5;
   model_neutral.num_successful_bookmark_commits = 10;
   model_neutral.num_updates_downloaded_total = 100;
   model_neutral.num_tombstone_updates_downloaded_total = 200;
   model_neutral.num_reflected_updates_downloaded_total = 50;
   model_neutral.num_local_overwrites = 15;
   model_neutral.num_server_overwrites = 18;
 
   const bool kIsShareUsable = true;
 
   const ModelTypeSet initial_sync_ended(BOOKMARKS, PREFERENCES);
   scoped_ptr<ListValue> expected_initial_sync_ended_value(
       ModelTypeSetToValue(initial_sync_ended));
 
-  ModelTypePayloadMap download_progress_markers;
-  download_progress_markers[BOOKMARKS] = "test";
-  download_progress_markers[APPS] = "apps";
+  ModelTypeStateMap download_progress_markers;
+  download_progress_markers[BOOKMARKS].payload = "test";
+  download_progress_markers[APPS].payload = "apps";
   scoped_ptr<DictionaryValue> expected_download_progress_markers_value(
-      ModelTypePayloadMapToValue(download_progress_markers));
+      ModelTypeStateMapToValue(download_progress_markers));
 
   const bool kHasMoreToSync = false;
   const bool kIsSilenced = true;
   const int kNumEncryptionConflicts = 1054;
   const int kNumHierarchyConflicts = 1055;
   const int kNumSimpleConflicts = 1056;
   const int kNumServerConflicts = 1057;
 
   SyncSourceInfo source;
   scoped_ptr<DictionaryValue> expected_source_value(source.ToValue());
@@ skipping 46 matching lines @@
                          "numSimpleConflicts");
   ExpectDictIntegerValue(kNumServerConflicts, *value,
                          "numServerConflicts");
   ExpectDictDictionaryValue(*expected_source_value, *value, "source");
   ExpectDictBooleanValue(false, *value, "notificationsEnabled");
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace syncer