Sync: Support multiple setup UIs.

chrome/browser/browsing_data/history_counter_browsertest.cc

 // Copyright (c) 2015 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 "chrome/browser/browsing_data/history_counter.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ skipping 336 matching lines @@
   // syncing history deletion, and this should restart the counter.
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(sync_service->IsSyncActive());
   ASSERT_TRUE(sync_service->GetPreferredDataTypes().Has(
       syncer::HISTORY_DELETE_DIRECTIVES));
   WaitForCountingOrConfirmFinished();
 
   // We stop syncing history deletion in particular. This restarts the counter.
   syncer::ModelTypeSet everything_except_history = syncer::ModelTypeSet::All();
   everything_except_history.Remove(syncer::HISTORY_DELETE_DIRECTIVES);
-  sync_service->SetSetupInProgress(true);
+  auto setup_handle = sync_service->GetSetupInProgressHandle();
   sync_service->ChangePreferredDataTypes(everything_except_history);
-  sync_service->SetSetupInProgress(false);
+  setup_handle.reset();
   WaitForCountingOrConfirmFinished();
 
   // If the history deletion sync is not affected, the counter is not restarted.
   syncer::ModelTypeSet only_passwords(syncer::PASSWORDS);
   sync_service->ChangePreferredDataTypes(only_passwords);
-  sync_service->SetSetupInProgress(true);
+  setup_handle = sync_service->GetSetupInProgressHandle();
   sync_service->ChangePreferredDataTypes(only_passwords);
-  sync_service->SetSetupInProgress(false);
+  setup_handle.reset();
   EXPECT_FALSE(counter.HasTrackedTasks());
   EXPECT_FALSE(CountingFinishedSinceLastAsked());
 
   // Same in this case.
   syncer::ModelTypeSet autofill_and_passwords(
       syncer::AUTOFILL, syncer::PASSWORDS);
-  sync_service->SetSetupInProgress(true);
+  setup_handle = sync_service->GetSetupInProgressHandle();
   sync_service->ChangePreferredDataTypes(autofill_and_passwords);
-  sync_service->SetSetupInProgress(false);
+  setup_handle.reset();
   EXPECT_FALSE(counter.HasTrackedTasks());
   EXPECT_FALSE(CountingFinishedSinceLastAsked());
 
   // We start syncing history deletion again. This restarts the counter.
-  sync_service->SetSetupInProgress(true);
+  setup_handle = sync_service->GetSetupInProgressHandle();
   sync_service->ChangePreferredDataTypes(syncer::ModelTypeSet::All());
-  sync_service->SetSetupInProgress(false);
+  setup_handle.reset();
   WaitForCountingOrConfirmFinished();
 
   // Changing the syncing datatypes to another set that still includes history
   // deletion should technically not trigger a restart, because the state of
   // history deletion did not change. However, in reality we can get two
   // notifications, one that history sync has stopped and another that it is
   // active again.
 
   // Stopping the Sync service triggers a restart.
   sync_service->RequestStop(sync_driver::SyncService::CLEAR_DATA);
   WaitForCountingOrConfirmFinished();
 }
 
 }  // namespace