[Sync] Add tests for migration triggered by notifications

chrome/browser/sync/profile_sync_service_harness.h

Index: chrome/browser/sync/profile_sync_service_harness.h
diff --git a/chrome/browser/sync/profile_sync_service_harness.h b/chrome/browser/sync/profile_sync_service_harness.h
index 8a00cc6d78c9dd941a9fe7af65dbad6d6c7a639f..5ec8a444deb00c7ee0e4e9d85378ca9423dc605f 100644
--- a/chrome/browser/sync/profile_sync_service_harness.h
+++ b/chrome/browser/sync/profile_sync_service_harness.h
@@ -32,8 +32,7 @@ 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();
 
@@ -74,6 +73,15 @@ class ProfileSyncServiceHarness : public ProfileSyncServiceObserver {
   // 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);
@@ -238,6 +246,10 @@ class ProfileSyncServiceHarness : public ProfileSyncServiceObserver {
   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();
 
@@ -278,9 +290,6 @@ class ProfileSyncServiceHarness : public ProfileSyncServiceObserver {
   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_;