sync: Loop committing items without downloading updates (v2)

sync/sessions/sync_session.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/sync_session.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 141 matching lines @@
 
   return SyncSessionSnapshot(
       status_controller_->syncer_status(),
       status_controller_->error(),
       status_controller_->num_server_changes_remaining(),
       is_share_useable,
       initial_sync_ended,
       download_progress_markers,
       HasMoreToSync(),
       delegate_->IsSyncingCurrentlySilenced(),
-      status_controller_->unsynced_handles().size(),
       status_controller_->TotalNumEncryptionConflictingItems(),
       status_controller_->TotalNumHierarchyConflictingItems(),
       status_controller_->TotalNumSimpleConflictingItems(),
       status_controller_->TotalNumServerConflictingItems(),
-      status_controller_->did_commit_items(),
       source_,
       context_->notifications_enabled(),
       dir->GetEntriesCount(),
       status_controller_->sync_start_time(),
       !Succeeded());
 }
 
 void SyncSession::SendEventNotification(SyncEngineEvent::EventCause cause) {
   SyncEngineEvent event(cause);
   event.snapshot = TakeSnapshot();
 
   DVLOG(1) << "Sending event with snapshot: " << event.snapshot.ToString();
   context()->NotifyListeners(event);
 }
 
 bool SyncSession::HasMoreToSync() const {
   const StatusController* status = status_controller_.get();
-  return ((status->commit_ids().size() < status->unsynced_handles().size()) &&
-      status->syncer_status().num_successful_commits > 0) ||
-      status->conflicts_resolved();
-      // Or, we have conflicting updates, but we're making progress on
-      // resolving them...
+  return status->conflicts_resolved();
 }
 
 const std::set<ModelSafeGroup>& SyncSession::GetEnabledGroups() const {
   return enabled_groups_;
 }
 
 std::set<ModelSafeGroup> SyncSession::GetEnabledGroupsWithConflicts() const {
   const std::set<ModelSafeGroup>& enabled_groups = GetEnabledGroups();
   std::set<ModelSafeGroup> enabled_groups_with_conflicts;
   for (std::set<ModelSafeGroup>::const_iterator it =
@@ skipping 44 matching lines @@
       IsError(status_controller_->error().last_post_commit_result);
   const bool process_commit_response_error =
       IsError(status_controller_->error().last_process_commit_response_result);
   return !download_updates_error
       && !post_commit_error
       && !process_commit_response_error;
 }
 
 }  // namespace sessions
 }  // namespace browser_sync