[Sync] Convert SyncSessionSnapshot to a copy-able class.

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 54 matching lines @@
   ExpectDictIntegerValue(status.num_tombstone_updates_downloaded_total,
                          *value, "numTombstoneUpdatesDownloadedTotal");
   ExpectDictIntegerValue(status.num_reflected_updates_downloaded_total,
                          *value, "numReflectedUpdatesDownloadedTotal");
   ExpectDictIntegerValue(status.num_local_overwrites,
                          *value, "numLocalOverwrites");
   ExpectDictIntegerValue(status.num_server_overwrites,
                          *value, "numServerOverwrites");
 }
 
-TEST_F(SessionStateTest, DownloadProgressMarkersToValue) {
-  std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
-  for (int i = syncable::FIRST_REAL_MODEL_TYPE;
-       i < syncable::MODEL_TYPE_COUNT; ++i) {
-    std::string marker(i, i);
-    download_progress_markers[i] = marker;
-  }
-
-  scoped_ptr<DictionaryValue> value(
-      DownloadProgressMarkersToValue(download_progress_markers));
-  EXPECT_EQ(syncable::MODEL_TYPE_COUNT - syncable::FIRST_REAL_MODEL_TYPE,
-            static_cast<int>(value->size()));
-  for (int i = syncable::FIRST_REAL_MODEL_TYPE;
-       i < syncable::MODEL_TYPE_COUNT; ++i) {
-    syncable::ModelType model_type = syncable::ModelTypeFromInt(i);
-    std::string marker(i, i);
-    std::string expected_value;
-    EXPECT_TRUE(base::Base64Encode(marker, &expected_value));
-    ExpectDictStringValue(expected_value,
-                          *value, syncable::ModelTypeToString(model_type));
-  }
-}
-
 TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
   SyncerStatus syncer_status;
   syncer_status.num_successful_commits = 500;
   scoped_ptr<DictionaryValue> expected_syncer_status_value(
       syncer_status.ToValue());
 
   ErrorCounters errors;
 
   const int kNumServerChangesRemaining = 105;
   const bool kIsShareUsable = true;
 
   const syncable::ModelTypeSet initial_sync_ended(
       syncable::BOOKMARKS, syncable::PREFERENCES);
   scoped_ptr<ListValue> expected_initial_sync_ended_value(
       syncable::ModelTypeSetToValue(initial_sync_ended));
 
-  std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
+  syncable::ModelTypePayloadMap download_progress_markers;
   download_progress_markers[syncable::BOOKMARKS] = "test";
   download_progress_markers[syncable::APPS] = "apps";
   scoped_ptr<DictionaryValue> expected_download_progress_markers_value(
-      DownloadProgressMarkersToValue(download_progress_markers));
+      syncable::ModelTypePayloadMapToValue(download_progress_markers));
 
   const bool kHasMoreToSync = false;
   const bool kIsSilenced = true;
   const int kUnsyncedCount = 1053;
   const int kNumEncryptionConflicts = 1054;
   const int kNumHierarchyConflicts = 1055;
   const int kNumSimpleConflicts = 1056;
   const int kNumServerConflicts = 1057;
   const bool kDidCommitItems = true;
 
@@ skipping 43 matching lines @@
                          "numServerConflicts");
   ExpectDictBooleanValue(kDidCommitItems, *value,
                          "didCommitItems");
   ExpectDictDictionaryValue(*expected_source_value, *value, "source");
   ExpectDictBooleanValue(false, *value, "notificationsEnabled");
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync