Revert of Sync: Support multiple setup UIs.

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>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
 
 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
 // and authentication. It provides ways to "wait" adequate periods of time for
 // several clients to get to the same state.
 class ProfileSyncServiceHarness {
  public:
   // The type of profile signin method to authenticate a profile.
   enum class SigninType {
     // Fakes user signin process.
@@ skipping 82 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;
 
-  // Signals that sync setup is complete, and that PSS may begin syncing.
-  void FinishSyncSetup();
-
  private:
   ProfileSyncServiceHarness(
       Profile* profile,
       const std::string& username,
       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();
 
   // Returns true if sync is disabled for this client.
   bool IsSyncDisabled() const;
 
   // Sync profile associated with this sync client.
   Profile* profile_;
 
   // 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_;
 
   // Used to decide what method of profile signin to use.
   const SigninType signin_type_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceHarness);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_PROFILE_SYNC_SERVICE_HARNESS_H_