Sync: Support multiple setup UIs.

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

Index: chrome/browser/sync/test/integration/profile_sync_service_harness.h
diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.h b/chrome/browser/sync/test/integration/profile_sync_service_harness.h
index d4958b680c66381f0610f5e64082ee9a917a630f..33ce604e15290d2e529dca5253c739d1282dcc17 100644
--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.h
+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.h
@@ -16,6 +16,10 @@
 class Profile;
 class ProfileSyncService;
 
+namespace sync_driver {
+class SyncSetupInProgressHandle;
+}
+
 // 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
@@ -118,6 +122,9 @@ class ProfileSyncServiceHarness {
   // available), annotated with |message|. Useful for logging.
   std::string GetClientInfoString(const std::string& message) const;
 
+  // Signals that sync setup is complete, and that PSS may begin syncing.
+  void FinishSyncSetup();
+
  private:
   ProfileSyncServiceHarness(
       Profile* profile,
@@ -125,9 +132,6 @@ class ProfileSyncServiceHarness {
       const std::string& password,
       SigninType signin_type);
 
-  // Signals that sync setup is complete, and that PSS may begin syncing.
-  void FinishSyncSetup();
-
   // Gets detailed status from |service_| in pretty-printable form.
   std::string GetServiceStatus();
 
@@ -140,6 +144,9 @@ class ProfileSyncServiceHarness {
   // ProfileSyncService object associated with |profile_|.
   ProfileSyncService* service_;
 
+  // Prevents Sync from running until configuration is complete.
+  std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
+
   // Credentials used for GAIA authentication.
   std::string username_;
   std::string password_;