Sync: Support multiple setup UIs.

components/browser_sync/browser/profile_sync_service_startup_unittest.cc

Index: components/browser_sync/browser/profile_sync_service_startup_unittest.cc
diff --git a/components/browser_sync/browser/profile_sync_service_startup_unittest.cc b/components/browser_sync/browser/profile_sync_service_startup_unittest.cc
index 86a9ad3af51657469447eec159016de8463a29ed..5148ba6915aa7ec995f42c4b43b48d137a2c0bec 100644
--- a/components/browser_sync/browser/profile_sync_service_startup_unittest.cc
+++ b/components/browser_sync/browser/profile_sync_service_startup_unittest.cc
@@ -199,7 +199,7 @@ TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
-  sync_service_->SetSetupInProgress(true);
+  auto setup_handle = sync_service_->GetSetupInProgressHandle();
 
   // Simulate successful signin as test_user.
   std::string account_id = SimulateTestUserSignin(sync_service_.get());
@@ -207,7 +207,7 @@ TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
   IssueTestTokens(account_id);
 
   // Simulate the UI telling sync it has finished setting up.
-  sync_service_->SetSetupInProgress(false);
+  setup_handle.reset();
   sync_service_->SetFirstSetupComplete();
   EXPECT_TRUE(sync_service_->IsSyncActive());
 }
@@ -232,14 +232,14 @@ TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartNoCredentials) {
       pref_service()->GetBoolean(sync_driver::prefs::kSyncFirstSetupComplete));
 
   // Then start things up.
-  sync_service_->SetSetupInProgress(true);
+  auto setup_handle = sync_service_->GetSetupInProgressHandle();
 
   // Simulate successful signin as test_user.
   std::string account_id = SimulateTestUserSignin(sync_service_.get());
 
   profile_sync_service_bundle_.auth_service()->LoadCredentials(account_id);
 
-  sync_service_->SetSetupInProgress(false);
+  setup_handle.reset();
   // ProfileSyncService should try to start by requesting access token.
   // This request should fail as login token was not issued.
   EXPECT_FALSE(sync_service_->IsSyncActive());
@@ -271,12 +271,12 @@ TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartInvalidCredentials) {
       WillRepeatedly(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
-  sync_service_->SetSetupInProgress(true);
+  auto setup_handle = sync_service_->GetSetupInProgressHandle();
 
   // Simulate successful signin.
   SimulateTestUserSignin(sync_service_.get());
 
-  sync_service_->SetSetupInProgress(false);
+  setup_handle.reset();
 
   // Verify we successfully finish startup and configuration.
   EXPECT_TRUE(sync_service_->IsSyncActive());
@@ -292,7 +292,7 @@ TEST_F(ProfileSyncServiceStartupCrosTest, StartCrosNoCredentials) {
   sync_service_->Initialize();
   // Sync should not start because there are no tokens yet.
   EXPECT_FALSE(sync_service_->IsSyncActive());
-  sync_service_->SetSetupInProgress(false);
+  sync_service_->SetFirstSetupComplete();

[maxbogue, 2016/06/09 20:04:13]

+1, good change.

[tommycli, 2016/06/10 00:04:15]

Acknowledged.

 
   // Sync should not start because there are still no tokens.
   EXPECT_FALSE(sync_service_->IsSyncActive());
@@ -478,8 +478,8 @@ TEST_F(ProfileSyncServiceStartupTest, StartDownloadFailed) {
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   sync_service_->Initialize();
 
-  sync_service_->SetSetupInProgress(true);
+  auto setup_handle = sync_service_->GetSetupInProgressHandle();
   IssueTestTokens(account_id);
-  sync_service_->SetSetupInProgress(false);
+  setup_handle.reset();
   EXPECT_FALSE(sync_service_->IsSyncActive());
 }