Fix the false-positive detection of commit errors

chrome/browser/sync/profile_sync_service_harness.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 58 matching lines @@
 
   // Blocks the caller until the sync backend host associated with this harness
   // has been initialized.  Returns true if the wait was successful.
   bool AwaitBackendInitialized();
 
   // Blocks the caller until the datatype manager is configured and sync has
   // been initialized (for example, after a browser restart).  Returns true if
   // the wait was successful.
   bool AwaitSyncRestart();
 
-  // Blocks the caller until this harness has completed a single sync cycle
+  // Block the caller until this harness has completed a single sync cycle
   // since the previous one.  Returns true if a sync cycle has completed.
-  bool AwaitSyncCycleCompletion(const std::string& reason);
+  bool AwaitDataSyncCompletion(const std::string& reason);
+
+  // Blocks the caller until this harness has completed as many sync cycles as
+  // are required to ensure its progress marker matches the latest available on
+  // the server.  
+  //
+  // Note: When other clients are committing changes this will not be reliable.
+  // Use one of the sync cycle functions to handle those cases.
+  bool AwaitFullSyncCompletion(const std::string& reason);
 
   // Blocks the caller until sync has been disabled for this client. Returns
   // true if sync is disabled.
   bool AwaitSyncDisabled(const std::string& reason);
 
   // Blocks the caller until exponential backoff has been verified to happen.
   bool AwaitExponentialBackoffVerification();
 
   // Blocks the caller until the syncer receives an actionable error.
   // Returns true if the sync client received an actionable error.
@@ skipping 90 matching lines @@
   enum WaitState {
     // The sync client has just been initialized.
     INITIAL_WAIT_STATE = 0,
 
     // The sync client awaits the OnBackendInitialized() callback.
     WAITING_FOR_ON_BACKEND_INITIALIZED,
 
     // The sync client is waiting for the first sync cycle to complete.
     WAITING_FOR_INITIAL_SYNC,
 
-    // The sync client is waiting for an ongoing sync cycle to complete.
-    WAITING_FOR_SYNC_TO_FINISH,
+    // The sync client is waiting for data to be synced.
+    WAITING_FOR_DATA_SYNC,
+
+    // The sync client is waiting for data and progress markers to be synced.
+    WAITING_FOR_FULL_SYNC,
 
     // The sync client anticipates incoming updates leading to a new sync cycle.
     WAITING_FOR_UPDATES,
 
     // The sync client is waiting for a passphrase to be required by the
     // cryptographer.
     WAITING_FOR_PASSPHRASE_REQUIRED,
 
     // The sync client is waiting for its passphrase to be accepted by the
     // cryptographer.
@@ skipping 54 matching lines @@
   void SignalStateComplete();
 
   // Finite state machine for controlling state.  Returns true only if a state
   // change has taken place.
   bool RunStateChangeMachine();
 
   // Returns true if a status change took place, false on timeout.
   bool AwaitStatusChangeWithTimeout(int timeout_milliseconds,
                                     const std::string& reason);
 
+  // A helper for implementing IsDataSynced() and IsFullySynced()
+  bool IsDataSyncedImpl(const browser_sync::sessions::SyncSessionSnapshot*);
+
   // Returns true if the sync client has no unsynced items.
-  bool IsSynced();
+  bool IsDataSynced();
+
+  // Returns true if the sync client has no unsynced items and its progress
+  // markers are believed to be up to date.
+  //
+  // Although we can't detect when commits from other clients invalidate our
+  // local progress markers, we do know when our own commits have invalidated
+  // our timestmaps.  This check returns true when this client has, to the best
+  // of its knowledge, downloaded the latest progress markers.
+  bool IsFullySynced();
 
   // Returns true if there is a backend migration in progress.
   bool HasPendingBackendMigration();
 
   // Returns true if this client has downloaded all the items that the
   // other client has.
   bool MatchesOtherClient(ProfileSyncServiceHarness* partner);
 
   // Returns a string with relevant info about client's sync state (if
   // available), annotated with |message|. Useful for logging.
@@ skipping 40 matching lines @@
   const std::string profile_debug_name_;
 
   // Keeps track of the number of attempts at exponential backoff and its
   // related bookkeeping information for verification.
   browser_sync::RetryVerifier retry_verifier_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceHarness);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_HARNESS_H_