Revert of Sync: Support multiple setup UIs.

chrome/browser/ui/webui/options/sync_setup_handler.h

 // Copyright (c) 2012 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_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_
 
 #include <memory>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "chrome/browser/sync/sync_startup_tracker.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 
 class LoginUIService;
 class ProfileSyncService;
 class SigninManagerBase;
 
 namespace content {
 class WebContents;
 }
 
 namespace signin_metrics {
 enum class AccessPoint;
 }
 
-namespace sync_driver {
-class SyncSetupInProgressHandle;
-}
-
 class SyncSetupHandler : public options::OptionsPageUIHandler,
                          public SyncStartupTracker::Observer,
                          public LoginUIService::LoginUI {
  public:
   SyncSetupHandler();
   ~SyncSetupHandler() override;
 
   // OptionsPageUIHandler implementation.
   void GetLocalizedValues(base::DictionaryValue* localized_strings) override;
   void RegisterMessages() override;
@@ skipping 106 matching lines @@
   // If a wizard already exists, focus it and return true.
   bool FocusExistingWizardIfPresent();
 
   // Display the configure sync UI. If |passphrase_failed| is true, the account
   // requires a passphrase and one hasn't been provided or it was invalid.
   void DisplayConfigureSync(bool passphrase_failed);
 
   // Helper object used to wait for the sync backend to startup.
   std::unique_ptr<SyncStartupTracker> sync_startup_tracker_;
 
-  // Prevents Sync from running until configuration is complete.
-  std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
-
   // Set to true whenever the sync configure UI is visible. This is used to tell
   // what stage of the setup wizard the user was in and to update the UMA
   // histograms in the case that the user cancels out.
   bool configuring_sync_;
 
   // The OneShotTimer object used to timeout of starting the sync backend
   // service.
   std::unique_ptr<base::OneShotTimer> backend_start_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_