FYI: Move conflict resolve + clean up afterwards

sync/internal_api/public/sessions/sync_session_snapshot.cc

Index: sync/internal_api/public/sessions/sync_session_snapshot.cc
diff --git a/sync/internal_api/public/sessions/sync_session_snapshot.cc b/sync/internal_api/public/sessions/sync_session_snapshot.cc
index 0f6fb016cba6244fd32de0e56c6607045efbac11..d835bdb3f5882a2aa738d1e1d9123ef9bf8ca627 100644
--- a/sync/internal_api/public/sessions/sync_session_snapshot.cc
+++ b/sync/internal_api/public/sessions/sync_session_snapshot.cc
@@ -13,11 +13,9 @@ namespace sessions {
 
 SyncSessionSnapshot::SyncSessionSnapshot()
     : is_share_usable_(false),
-      has_more_to_sync_(false),
       is_silenced_(false),
       num_encryption_conflicts_(0),
       num_hierarchy_conflicts_(0),
-      num_simple_conflicts_(0),
       num_server_conflicts_(0),
       notifications_enabled_(false),
       num_entries_(0),
@@ -30,11 +28,9 @@ SyncSessionSnapshot::SyncSessionSnapshot(
     bool is_share_usable,
     ModelTypeSet initial_sync_ended,
     const ProgressMarkerMap& 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,
@@ -45,11 +41,9 @@ SyncSessionSnapshot::SyncSessionSnapshot(
       is_share_usable_(is_share_usable),
       initial_sync_ended_(initial_sync_ended),
       download_progress_markers_(download_progress_markers),
-      has_more_to_sync_(more_to_sync),
       is_silenced_(is_silenced),
       num_encryption_conflicts_(num_encryption_conflicts),
       num_hierarchy_conflicts_(num_hierarchy_conflicts),
-      num_simple_conflicts_(num_simple_conflicts),
       num_server_conflicts_(num_server_conflicts),
       source_(source),
       notifications_enabled_(notifications_enabled),
@@ -85,15 +79,12 @@ DictionaryValue* SyncSessionSnapshot::ToValue() const {
              ModelTypeSetToValue(initial_sync_ended_));
   value->Set("downloadProgressMarkers",
              ProgressMarkerMapToValue(download_progress_markers_).release());
-  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",
                     num_server_conflicts_);
   value->SetInteger("numEntries", num_entries_);
@@ -128,10 +119,6 @@ const ProgressMarkerMap&
   return download_progress_markers_;
 }
 
-bool SyncSessionSnapshot::has_more_to_sync() const {
-  return has_more_to_sync_;
-}
-
 bool SyncSessionSnapshot::is_silenced() const {
   return is_silenced_;
 }
@@ -144,10 +131,6 @@ int SyncSessionSnapshot::num_hierarchy_conflicts() const {
   return num_hierarchy_conflicts_;
 }
 
-int SyncSessionSnapshot::num_simple_conflicts() const {
-  return num_simple_conflicts_;
-}
-
 int SyncSessionSnapshot::num_server_conflicts() const {
   return num_server_conflicts_;
 }