Sync: Support multiple setup UIs.

ios/chrome/browser/sync/sync_setup_service.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/chrome/browser/sync/sync_setup_service.h"
 
 #include <stdio.h>
 
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 40 matching lines @@
 syncer::ModelTypeSet SyncSetupService::GetDataTypes() const {
   return sync_service_->GetPreferredDataTypes();
 }
 
 bool SyncSetupService::IsDataTypeEnabled(syncer::ModelType datatype) const {
   return GetDataTypes().Has(datatype);
 }
 
 void SyncSetupService::SetDataTypeEnabled(syncer::ModelType datatype,
                                           bool enabled) {
-  sync_service_->SetSetupInProgress(true);
+  setup_handle_ = sync_service_->GetSetupInProgressHandle();
   syncer::ModelTypeSet types = GetDataTypes();
   if (enabled)
     types.Put(datatype);
   else
     types.Remove(datatype);
   types.RetainAll(user_selectable_types_);
   if (enabled && !IsSyncEnabled())
     SetSyncEnabledWithoutChangingDatatypes(true);
   sync_service_->OnUserChoseDatatypes(IsSyncingAllDataTypes(), types);
   if (GetDataTypes().Empty())
@@ skipping 21 matching lines @@
       return true;
   }
 }
 
 bool SyncSetupService::IsSyncingAllDataTypes() const {
   sync_driver::SyncPrefs sync_prefs(prefs_);
   return sync_prefs.HasKeepEverythingSynced();
 }
 
 void SyncSetupService::SetSyncingAllDataTypes(bool sync_all) {
-  sync_service_->SetSetupInProgress(true);
+  setup_handle_ = sync_service_->GetSetupInProgressHandle();
   if (sync_all && !IsSyncEnabled())
     SetSyncEnabled(true);
   sync_service_->OnUserChoseDatatypes(
       sync_all, Intersection(GetDataTypes(), syncer::UserSelectableTypes()));
 }
 
 bool SyncSetupService::IsSyncEnabled() const {
   return sync_service_->CanSyncStart();
 }
 
@@ skipping 50 matching lines @@
   //   OR
   //   2. User is not signed in or has disabled sync.
   return !sync_service_->CanSyncStart() ||
          sync_service_->IsFirstSetupComplete();
 }
 
 void SyncSetupService::PrepareForFirstSyncSetup() {
   // |PrepareForFirstSyncSetup| should always be called while the user is signed
   // out. At that time, sync setup is not completed.
   DCHECK(!sync_service_->IsFirstSetupComplete());
-  sync_service_->SetSetupInProgress(true);
+  setup_handle_ = sync_service_->GetSetupInProgressHandle();
 }
 
 void SyncSetupService::CommitChanges() {
   if (sync_service_->IsFirstSetupInProgress()) {
     // Turn on the sync setup completed flag only if the user did not turn sync
     // off.
     if (sync_service_->CanSyncStart()) {
       sync_service_->SetFirstSetupComplete();
     }
   }
 
-  sync_service_->SetSetupInProgress(false);
+  setup_handle_.reset();
 }
 
 bool SyncSetupService::HasUncommittedChanges() {
   return sync_service_->IsSetupInProgress();
 }
 
 void SyncSetupService::SetSyncEnabledWithoutChangingDatatypes(
     bool sync_enabled) {
-  sync_service_->SetSetupInProgress(true);
+  setup_handle_ = sync_service_->GetSetupInProgressHandle();
   if (sync_enabled) {
     sync_service_->RequestStart();
   } else {
     UMA_HISTOGRAM_ENUMERATION("Sync.StopSource", syncer::CHROME_SYNC_SETTINGS,
                               syncer::STOP_SOURCE_LIMIT);
     sync_service_->RequestStop(sync_driver::SyncService::KEEP_DATA);
   }
 }