sync: Loop committing items without downloading updates (v2)

chrome/browser/sync/profile_sync_service_harness.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 "chrome/browser/sync/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ skipping 774 matching lines @@
       is_data_synced ? "IsDataSynced: true" : "IsDataSynced: false");
   return is_data_synced;
 }
 
 bool ProfileSyncServiceHarness::IsFullySynced() {
   if (service() == NULL) {
     DVLOG(1) << GetClientInfoString("IsFullySynced: false");
     return false;
   }
   const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
-  // snap.unsynced_count() == 0 is a fairly reliable indicator of whether or not
-  // our timestamp is in sync with the server.
-  bool is_fully_synced = IsDataSyncedImpl(snap) &&
-      snap.unsynced_count() == 0;
+  // If we didn't try to commit anything in the previous cycle, there's a
+  // good chance that we're now fully up to date.
+  bool is_fully_synced =
+      (snap.errors().last_post_commit_result == browser_sync::UNSET)
+      && IsDataSyncedImpl(snap);
 
   DVLOG(1) << GetClientInfoString(
       is_fully_synced ? "IsFullySynced: true" : "IsFullySynced: false");
   return is_fully_synced;
 }
 
 bool ProfileSyncServiceHarness::HasPendingBackendMigration() {
   browser_sync::BackendMigrator* migrator =
       service()->GetBackendMigratorForTest();
   return migrator && migrator->state() != browser_sync::BackendMigrator::IDLE;
@@ skipping 182 matching lines @@
   std::stringstream os;
   os << profile_debug_name_ << ": " << message << ": ";
   if (service()) {
     const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
     const ProfileSyncService::Status& status = GetStatus();
     // Capture select info from the sync session snapshot and syncer status.
     os << "has_more_to_sync: "
        << snap.has_more_to_sync()
        << ", has_unsynced_items: "
        << (service()->sync_initialized() ? service()->HasUnsyncedItems() : 0)
-       << ", unsynced_count: "
-       << snap.unsynced_count()
        << ", encryption conflicts: "
        << snap.num_encryption_conflicts()
        << ", hierarchy conflicts: "
        << snap.num_hierarchy_conflicts()
        << ", simple conflicts: "
        << snap.num_simple_conflicts()
        << ", server conflicts: "
        << snap.num_server_conflicts()
        << ", num_updates_downloaded : "
        << snap.syncer_status().num_updates_downloaded_total
@@ skipping 92 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   DictionaryValue value;
   sync_ui_util::ConstructAboutInformation(service_, &value);
   std::string service_status;
   base::JSONWriter::WriteWithOptions(&value,
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &service_status);
   return service_status;
 }