Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/internal_api/public/sessions/sync_session_snapshot.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/internal_api/public/sessions/sync_session_snapshot.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
@@ skipping 11 matching lines @@
       notifications_enabled_(false),
       num_entries_(0),
       retry_scheduled_(false),
       is_initialized_(false) {
 }
 
 SyncSessionSnapshot::SyncSessionSnapshot(
     const ModelNeutralState& model_neutral_state,
     bool is_share_usable,
     ModelTypeSet initial_sync_ended,
-    const ModelTypePayloadMap& download_progress_markers,
+    const ModelTypeStateMap& download_progress_markers,
     bool more_to_sync,
     bool is_silenced,
     int num_encryption_conflicts,
     int num_hierarchy_conflicts,
     int num_simple_conflicts,
     int num_server_conflicts,
     const SyncSourceInfo& source,
     bool notifications_enabled,
     size_t num_entries,
     base::Time sync_start_time,
@@ skipping 34 matching lines @@
                     model_neutral_state_.num_local_overwrites);
   value->SetInteger("numServerOverwrites",
                     model_neutral_state_.num_server_overwrites);
   value->SetInteger(
       "numServerChangesRemaining",
       static_cast<int>(model_neutral_state_.num_server_changes_remaining));
   value->SetBoolean("isShareUsable", is_share_usable_);
   value->Set("initialSyncEnded",
              ModelTypeSetToValue(initial_sync_ended_));
   value->Set("downloadProgressMarkers",
-             ModelTypePayloadMapToValue(download_progress_markers_));
+             ModelTypeStateMapToValue(download_progress_markers_));
   value->SetBoolean("hasMoreToSync", has_more_to_sync_);
   value->SetBoolean("isSilenced", is_silenced_);
   // We don't care too much if we lose precision here, also.
   value->SetInteger("numEncryptionConflicts",
                     num_encryption_conflicts_);
   value->SetInteger("numHierarchyConflicts",
                     num_hierarchy_conflicts_);
   value->SetInteger("numSimpleConflicts",
                     num_simple_conflicts_);
   value->SetInteger("numServerConflicts",
@@ skipping 18 matching lines @@
 }
 
 bool SyncSessionSnapshot::is_share_usable() const {
   return is_share_usable_;
 }
 
 ModelTypeSet SyncSessionSnapshot::initial_sync_ended() const {
   return initial_sync_ended_;
 }
 
-ModelTypePayloadMap SyncSessionSnapshot::download_progress_markers() const {
+ModelTypeStateMap SyncSessionSnapshot::download_progress_markers() const {
   return download_progress_markers_;
 }
 
 bool SyncSessionSnapshot::has_more_to_sync() const {
   return has_more_to_sync_;
 }
 
 bool SyncSessionSnapshot::is_silenced() const {
   return is_silenced_;
 }
@@ skipping 33 matching lines @@
 bool SyncSessionSnapshot::retry_scheduled() const {
   return retry_scheduled_;
 }
 
 bool SyncSessionSnapshot::is_initialized() const {
   return is_initialized_;
 }
 
 }  // namespace sessions
 }  // namespace syncer