sync: Loop committing items without downloading updates (v2)

sync/sessions/session_state.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 <map>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 68 matching lines @@
     : last_download_updates_result(UNSET),
       last_post_commit_result(UNSET),
       last_process_commit_response_result(UNSET) {
 }
 
 SyncSessionSnapshot::SyncSessionSnapshot()
     : num_server_changes_remaining_(0),
       is_share_usable_(false),
       has_more_to_sync_(false),
       is_silenced_(false),
-      unsynced_count_(0),
       num_encryption_conflicts_(0),
       num_hierarchy_conflicts_(0),
       num_simple_conflicts_(0),
       num_server_conflicts_(0),
-      did_commit_items_(false),
       notifications_enabled_(false),
       num_entries_(0),
       retry_scheduled_(false) {
 }
 
 SyncSessionSnapshot::SyncSessionSnapshot(
     const SyncerStatus& syncer_status,
     const ErrorCounters& errors,
     int64 num_server_changes_remaining,
     bool is_share_usable,
     syncable::ModelTypeSet initial_sync_ended,
     const syncable::ModelTypePayloadMap& download_progress_markers,
     bool more_to_sync,
     bool is_silenced,
-    int64 unsynced_count,
     int num_encryption_conflicts,
     int num_hierarchy_conflicts,
     int num_simple_conflicts,
     int num_server_conflicts,
-    bool did_commit_items,
     const SyncSourceInfo& source,
     bool notifications_enabled,
     size_t num_entries,
     base::Time sync_start_time,
     bool retry_scheduled)
     : syncer_status_(syncer_status),
       errors_(errors),
       num_server_changes_remaining_(num_server_changes_remaining),
       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),
-      unsynced_count_(unsynced_count),
       num_encryption_conflicts_(num_encryption_conflicts),
       num_hierarchy_conflicts_(num_hierarchy_conflicts),
       num_simple_conflicts_(num_simple_conflicts),
       num_server_conflicts_(num_server_conflicts),
-      did_commit_items_(did_commit_items),
       source_(source),
       notifications_enabled_(notifications_enabled),
       num_entries_(num_entries),
       sync_start_time_(sync_start_time),
       retry_scheduled_(retry_scheduled) {
 }
 
 SyncSessionSnapshot::~SyncSessionSnapshot() {}
 
 DictionaryValue* SyncSessionSnapshot::ToValue() const {
   DictionaryValue* value = new DictionaryValue();
   value->Set("syncerStatus", syncer_status_.ToValue());
   // We don't care too much if we lose precision here.
   value->SetInteger("numServerChangesRemaining",
                     static_cast<int>(num_server_changes_remaining_));
   value->SetBoolean("isShareUsable", is_share_usable_);
   value->Set("initialSyncEnded",
              syncable::ModelTypeSetToValue(initial_sync_ended_));
   value->Set("downloadProgressMarkers",
              syncable::ModelTypePayloadMapToValue(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("unsyncedCount",
-                    static_cast<int>(unsynced_count_));
   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->SetBoolean("didCommitItems", did_commit_items_);
   value->SetInteger("numEntries", num_entries_);
   value->Set("source", source_.ToValue());
   value->SetBoolean("notificationsEnabled", notifications_enabled_);
   return value;
 }
 
 std::string SyncSessionSnapshot::ToString() const {
   scoped_ptr<DictionaryValue> value(ToValue());
   std::string json;
   base::JSONWriter::WriteWithOptions(value.get(),
@@ skipping 28 matching lines @@
 }
 
 bool SyncSessionSnapshot::has_more_to_sync() const {
   return has_more_to_sync_;
 }
 
 bool SyncSessionSnapshot::is_silenced() const {
   return is_silenced_;
 }
 
-int64 SyncSessionSnapshot::unsynced_count() const {
-  return unsynced_count_;
-}
-
 int SyncSessionSnapshot::num_encryption_conflicts() const {
   return num_encryption_conflicts_;
 }
 
 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_;
 }
 
-bool SyncSessionSnapshot::did_commit_items() const {
-  return did_commit_items_;
-}
-
 SyncSourceInfo SyncSessionSnapshot::source() const {
   return source_;
 }
 
 bool SyncSessionSnapshot::notifications_enabled() const {
   return notifications_enabled_;
 }
 
 size_t SyncSessionSnapshot::num_entries() const {
   return num_entries_;
@@ skipping 124 matching lines @@
   std::vector<AppliedUpdate>::const_iterator it;
   for (it = applied_updates_.begin(); it != applied_updates_.end(); ++it) {
     if (it->first != SUCCESS) {
       return true;
     }
   }
   return false;
 }
 
 AllModelTypeState::AllModelTypeState(bool* dirty_flag)
-    : unsynced_handles(dirty_flag),
-      syncer_status(dirty_flag),
+    : syncer_status(dirty_flag),
       error(dirty_flag),
-      num_server_changes_remaining(dirty_flag, 0),
-      commit_set(ModelSafeRoutingInfo()) {
+      num_server_changes_remaining(dirty_flag, 0) {
 }
 
 AllModelTypeState::~AllModelTypeState() {}
 
 PerModelSafeGroupState::PerModelSafeGroupState(bool* dirty_flag)
     : conflict_progress(dirty_flag) {
 }
 
 PerModelSafeGroupState::~PerModelSafeGroupState() {
 }
 
 }  // namespace sessions
 }  // namespace browser_sync