Sync: Support multiple setup UIs.

components/browser_sync/browser/profile_sync_service_startup_unittest.cc

 // Copyright (c) 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 <memory>
 #include <utility>
 
 #include "base/files/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 181 matching lines @@
   Mock::VerifyAndClearExpectations(data_type_manager);
 
   // Then start things up.
   EXPECT_CALL(*data_type_manager, Configure(_, _)).Times(1);
   EXPECT_CALL(*data_type_manager, state()).
       WillOnce(Return(DataTypeManager::CONFIGURED)).
       WillOnce(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 as test_user.
   std::string account_id = SimulateTestUserSignin(sync_service_.get());
   // Create some tokens in the token service.
   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());
 }
 
 // TODO(pavely): Reenable test once android is switched to oauth2.
 TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartNoCredentials) {
   // We've never completed startup.
   pref_service()->ClearPref(sync_driver::prefs::kSyncFirstSetupComplete);
   CreateSyncService(ProfileSyncService::MANUAL_START);
 
   // Should not actually start, rather just clean things up and wait
   // to be enabled.
   EXPECT_CALL(*component_factory_, CreateDataTypeManager(_, _, _, _, _))
       .Times(0);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   sync_service_->Initialize();
 
   // Preferences should be back to defaults.
   EXPECT_EQ(0,
             pref_service()->GetInt64(sync_driver::prefs::kSyncLastSyncedTime));
   EXPECT_FALSE(
       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());
   EXPECT_EQ(GoogleServiceAuthError::USER_NOT_SIGNED_UP,
             sync_service_->GetAuthError().state());
 }
 
 // TODO(pavely): Reenable test once android is switched to oauth2.
 TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartInvalidCredentials) {
   CreateSyncService(ProfileSyncService::MANUAL_START);
@@ skipping 11 matching lines @@
   sync_service_->Initialize();
   EXPECT_FALSE(sync_service_->IsSyncActive());
   Mock::VerifyAndClearExpectations(data_type_manager);
 
   // Update the credentials, unstalling the backend.
   EXPECT_CALL(*data_type_manager, Configure(_, _));
   EXPECT_CALL(*data_type_manager, state()).
       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());
 }
 
 TEST_F(ProfileSyncServiceStartupCrosTest, StartCrosNoCredentials) {
   EXPECT_CALL(*component_factory_, CreateDataTypeManager(_, _, _, _, _))
       .Times(0);
   EXPECT_CALL(*component_factory_, CreateSyncBackendHost(_, _, _, _)).Times(0);
   pref_service()->ClearPref(sync_driver::prefs::kSyncFirstSetupComplete);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
   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());
 }
 
 TEST_F(ProfileSyncServiceStartupCrosTest, StartFirstTime) {
   SetUpSyncBackendHost();
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
   pref_service()->ClearPref(sync_driver::prefs::kSyncFirstSetupComplete);
   EXPECT_CALL(*data_type_manager, Configure(_, _));
@@ skipping 165 matching lines @@
   CreateSyncService(ProfileSyncService::MANUAL_START);
   std::string account_id = SimulateTestUserSignin(sync_service_.get());
   SyncBackendHostMock* mock_sbh = SetUpSyncBackendHost();
   mock_sbh->set_fail_initial_download(true);
 
   pref_service()->ClearPref(sync_driver::prefs::kSyncFirstSetupComplete);
 
   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());
 }