Sync: Support multiple setup UIs.

components/browser_sync/browser/profile_sync_service.cc

Index: components/browser_sync/browser/profile_sync_service.cc
diff --git a/components/browser_sync/browser/profile_sync_service.cc b/components/browser_sync/browser/profile_sync_service.cc
index a41b846d748d38185b63c7bdc93751727ff758ed..e29541a15532d8f987bb246af6d2ed9a53539569 100644
--- a/components/browser_sync/browser/profile_sync_service.cc
+++ b/components/browser_sync/browser/profile_sync_service.cc
@@ -1530,17 +1530,6 @@ bool ProfileSyncService::IsFirstSetupInProgress() const {
   return !IsFirstSetupComplete() && startup_controller_->IsSetupInProgress();
 }
 
-void ProfileSyncService::SetSetupInProgress(bool setup_in_progress) {
-  // This method is a no-op if |setup_in_progress_| remains unchanged.
-  if (startup_controller_->IsSetupInProgress() == setup_in_progress)
-    return;
-
-  startup_controller_->SetSetupInProgress(setup_in_progress);
-  if (!setup_in_progress && IsBackendInitialized())
-    ReconfigureDatatypeManager();
-  NotifyObservers();
-}
-
 bool ProfileSyncService::IsSyncAllowed() const {
   return IsSyncAllowedByFlag() && !IsManaged() && IsSyncAllowedByPlatform();
 }
@@ -1783,6 +1772,17 @@ void ProfileSyncService::SetPlatformSyncAllowedProvider(
   platform_sync_allowed_provider_ = platform_sync_allowed_provider;
 }
 
+void ProfileSyncService::SetSetupInProgress(bool setup_in_progress) {
+  // This method is a no-op if |setup_in_progress_| remains unchanged.
+  if (startup_controller_->IsSetupInProgress() == setup_in_progress)
+    return;
+
+  startup_controller_->SetSetupInProgress(setup_in_progress);
+  if (!setup_in_progress && IsBackendInitialized())
+    ReconfigureDatatypeManager();
+  NotifyObservers();
+}
+
 void ProfileSyncService::ConfigureDataTypeManager() {
   // Don't configure datatypes if the setup UI is still on the screen - this
   // is to help multi-screen setting UIs (like iOS) where they don't want to