Reland: "Sync: Support multiple setup UIs."

chrome/browser/ui/webui/settings/people_handler.cc

Index: chrome/browser/ui/webui/settings/people_handler.cc
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index 41811cdeba581c8de5d3bce61c1b78b5c4c92354..8c90a9ebd124a06727614518f51b1a7b6982499f 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -315,7 +315,7 @@ bool PeopleHandler::PrepareSyncSetup() {
 
   ProfileSyncService* service = GetSyncService();
   if (service)
-    service->SetSetupInProgress(true);
+    sync_blocker_ = service->GetSetupInProgressHandle();
 
   return true;
 }
@@ -629,8 +629,7 @@ void PeopleHandler::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;
 }
@@ -934,7 +933,7 @@ void PeopleHandler::MarkFirstSetupComplete() {
 
   // We're done configuring, so notify ProfileSyncService that it is OK to
   // start syncing.
-  service->SetSetupInProgress(false);
+  sync_blocker_.reset();
   service->SetFirstSetupComplete();
 }