Revert of Sync: Support multiple setup UIs.

chrome/browser/sync/profile_sync_service_android.h

Index: chrome/browser/sync/profile_sync_service_android.h
diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h
index b8c5d04e6bb2e6eb1c718b933983c864b015bec1..45099020c3feb34e237ec9a1acf357a77862b8ad 100644
--- a/chrome/browser/sync/profile_sync_service_android.h
+++ b/chrome/browser/sync/profile_sync_service_android.h
@@ -18,10 +18,6 @@
 #include "components/sync_driver/sync_service_observer.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google_apis/gaia/google_service_auth_error.h"
-
-namespace sync_driver {
-class SyncSetupInProgressHandle;
-}
 
 class Profile;
 class ProfileSyncService;
@@ -195,9 +191,6 @@
   // A reference to the sync service for this profile.
   ProfileSyncService* sync_service_;
 
-  // Prevents Sync from running until configuration is complete.
-  std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
-
   // The class that handles getting, setting, and persisting sync
   // preferences.
   std::unique_ptr<sync_driver::SyncPrefs> sync_prefs_;