sync: Change progress marker checking in tests

chrome/browser/sync/test/integration/profile_sync_service_harness.h

 // Copyright 2013 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_TEST_INTEGRATION_PROFILE_SYNC_SERVICE_HARNESS_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PROFILE_SYNC_SERVICE_HARNESS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 70 matching lines @@
   bool AwaitCommitActivityCompletion();
 
   // Blocks the caller until sync has been disabled for this client. Returns
   // true if sync is disabled.
   bool AwaitSyncDisabled();
 
   // Blocks the caller until sync setup is complete for this client. Returns
   // true if sync setup is complete.
   bool AwaitSyncSetupCompletion();
 
-  // Blocks the caller until this harness has observed that the sync engine
-  // has downloaded all the changes seen by the |partner| harness's client.
-  bool WaitUntilProgressMarkersMatch(ProfileSyncServiceHarness* partner);
-
   // Calling this acts as a barrier and blocks the caller until |this| and
   // |partner| have both completed a sync cycle.  When calling this method,
   // the |partner| should be the passive responder who responds to the actions
   // of |this|.  This method relies upon the synchronization of callbacks
   // from the message queue. Returns true if two sync cycles have completed.
   // Note: Use this method when exactly one client makes local change(s), and
   // exactly one client is waiting to receive those changes.
   bool AwaitMutualSyncCycleCompletion(ProfileSyncServiceHarness* partner);
 
   // Blocks the caller until |this| completes its ongoing sync cycle and every
@@ skipping 75 matching lines @@
 
   // Returns a string that can be used as the value of an oauth2 refresh token.
   // This function guarantees that a different string is returned each time
   // it is called.
   std::string GenerateFakeOAuth2RefreshTokenString();
 
   // Returns a string with relevant info about client's sync state (if
   // available), annotated with |message|. Useful for logging.
   std::string GetClientInfoString(const std::string& message) const;
 
-  // Returns true if this client has downloaded all the items that the
-  // other client has.
-  bool MatchesPartnerClient() const;
-
  private:
   ProfileSyncServiceHarness(
       Profile* profile,
       const std::string& username,
       const std::string& password,
       invalidation::P2PInvalidationService* invalidation_service);
 
   // Quits the current message loop. Called when the status change being waited
   // on has occurred, or in the event of a timeout.
   void QuitMessageLoop();
 
   // Signals that sync setup is complete, and that PSS may begin syncing.
   void FinishSyncSetup();
 
   // Gets the current progress marker of the current sync session for a
   // particular datatype. Returns an empty string if the progress marker isn't
   // found.
   std::string GetSerializedProgressMarker(syncer::ModelType model_type) const;
 
-  // Returns true if a client has nothing left to commit and its progress
-  // markers are up to date.
-  bool HasLatestProgressMarkers() const;
-
   // Gets detailed status from |service_| in pretty-printable form.
   std::string GetServiceStatus();
 
   // Sync profile associated with this sync client.
   Profile* profile_;
 
   // ProfileSyncService object associated with |profile_|.
   ProfileSyncService* service_;
 
   // An bridge between the ProfileSyncService and P2PInvalidationService.
   scoped_ptr<P2PInvalidationForwarder> p2p_invalidation_forwarder_;
 
-  // The harness of the client whose update progress marker we're expecting
-  // eventually match.
-  ProfileSyncServiceHarness* progress_marker_partner_;
-
   // Credentials used for GAIA authentication.
   std::string username_;
   std::string password_;
 
   // Number used by GenerateFakeOAuth2RefreshTokenString() to make sure that
   // all refresh tokens used in the tests are different.
   int oauth2_refesh_token_number_;
 
   // Used for logging.
   const std::string profile_debug_name_;
 
   // Keeps track of the state change on which we are waiting. PSSHarness can
   // wait on only one status change at a time.
   StatusChangeChecker* status_change_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceHarness);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_PROFILE_SYNC_SERVICE_HARNESS_H_