Reland: "Sync: Support multiple setup UIs."

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

Index: chrome/browser/ui/webui/options/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc
index f48402af8136ceaf6890541eca9ea0a8b98d64ea..3462aee7e2f2215356b099492a0cf0cb8e17b0c5 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc
@@ -301,7 +301,7 @@ void SyncSetupHandler::ConfigureSyncDone() {
 
     // We're done configuring, so notify ProfileSyncService that it is OK to
     // start syncing.
-    service->SetSetupInProgress(false);
+    sync_blocker_.reset();
     service->SetFirstSetupComplete();
   }
 }
@@ -419,7 +419,7 @@ bool SyncSetupHandler::PrepareSyncSetup() {
 
   ProfileSyncService* service = GetSyncService();
   if (service)
-    service->SetSetupInProgress(true);
+    sync_blocker_ = service->GetSetupInProgressHandle();
 
   return true;
 }
@@ -726,8 +726,7 @@ void SyncSetupHandler::CloseSyncSetup() {
   // Alert the sync service anytime the sync setup dialog is closed. This can
   // happen due to the user clicking the OK or Cancel button, or due to the
   // dialog being closed by virtue of sync being disabled in the background.
-  if (sync_service)
-    sync_service->SetSetupInProgress(false);
+  sync_blocker_.reset();
 
   configuring_sync_ = false;
 }