[Sync] Add tests for migration triggered by notifications

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 14 matching lines @@
 
 // An instance of this class is basically our notion of a "sync client" for
 // automation purposes. It harnesses the ProfileSyncService member of the
 // profile passed to it on construction and automates certain things like setup
 // and authentication. It provides ways to "wait" adequate periods of time for
 // several clients to get to the same state.
 class ProfileSyncServiceHarness : public ProfileSyncServiceObserver {
  public:
   ProfileSyncServiceHarness(Profile* profile,
                             const std::string& username,
-                            const std::string& password,
-                            bool expected_notifications_enabled);
+                            const std::string& password);
 
   virtual ~ProfileSyncServiceHarness();
 
   // Creates a ProfileSyncServiceHarness object and attaches it to |profile|, a
   // profile that is assumed to have been signed into sync in the past. Caller
   // takes ownership.
   static ProfileSyncServiceHarness* CreateAndAttach(Profile* profile);
 
   // Sets the GAIA credentials with which to sign in to sync.
   void SetCredentials(const std::string& username, const std::string& password);
@@ skipping 20 matching lines @@
 
   // 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
   // since the previous one.  Returns true if a sync cycle has completed.
   bool AwaitSyncCycleCompletion(const std::string& reason);
 
+  // Blocks the caller until this harness has completed a single sync
+  // cycle, even if we're already synced.  Returns true if a sync
+  // cycle has completed.
+  //
+  // TODO(akalin): This is only used by some migration tests, pending
+  // the fix for http://crbug.com/92928.  Remove this once that is
+  // fixed.
+  bool AwaitNextSyncCycleCompletion(const std::string& reason);
+
   // Blocks the caller until the 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 this harness has observed that the sync engine
   // has downloaded all the changes seen by the |partner| harness's client.
   bool WaitUntilTimestampMatches(
@@ skipping 144 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);
 
+  // Used by AwaitSyncCycleCompletion() and
+  // AwaitNextSyncCycleCompletion().
+  bool AwaitSyncCycleCompletionHelper(const std::string& reason);
+
   // Returns true if the sync client has no unsynced items.
   bool IsSynced();
 
   // 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.
   std::string GetClientInfoString(const std::string& message);
@@ skipping 20 matching lines @@
   ProfileSyncService* service_;
 
   // The harness of the client whose update progress marker we're expecting
   // eventually match.
   ProfileSyncServiceHarness* timestamp_match_partner_;
 
   // Credentials used for GAIA authentication.
   std::string username_;
   std::string password_;
 
-  // The expected value of GetStatus().notifications_enabled.
-  bool expected_notifications_enabled_;
-
   // Used for logging.
   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_