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 a32d344dea3a5fb52a5cf0988ad1b163c3ef9a24..feba9683bf5f76df5b8db64449d4e9a89cd226c9 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -304,7 +304,7 @@ bool PeopleHandler::PrepareSyncSetup() {
 
   ProfileSyncService* service = GetSyncService();
   if (service)
-    service->SetSetupInProgress(true);
+    sync_blocker_ = service->GetSetupInProgressHandle();
 
   return true;
 }
@@ -614,8 +614,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;
 }
@@ -914,7 +913,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();
 }