Sync: Support multiple setup UIs.

chrome/browser/sync/test/integration/profile_sync_service_harness.cc

 // Copyright 2013 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/sync/test/integration/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <sstream>
@@ skipping 137 matching lines @@
       << "SetupSync should not be used for legacy supervised users.";
 
   // Initialize the sync client's profile sync service object.
   if (service() == NULL) {
     LOG(ERROR) << "SetupSync(): service() is null.";
     return false;
   }
 
   // Tell the sync service that setup is in progress so we don't start syncing
   // until we've finished configuration.
-  service()->SetSetupInProgress(true);
+  setup_handle_ = service()->GetSetupInProgressHandle();
 
   DCHECK(!username_.empty());
   if (signin_type_ == SigninType::UI_SIGNIN) {
     Browser* browser = chrome::FindBrowserWithProfile(profile_);
     DCHECK(browser);
     if (!login_ui_test_utils::SignInWithUI(browser, username_, password_)) {
       LOG(ERROR) << "Could not sign in to GAIA servers.";
+      setup_handle_.reset();

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

Why this extra reset, here and below?

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

Done. It was there to prevent the test to need to call FinishSyncSetup, but I
guess it's simpler to just require the test to call FinishSyncSetup.

       return false;
     }
   } else if (signin_type_ == SigninType::FAKE_SIGNIN) {
     // Authenticate sync client using GAIA credentials.
     std::string gaia_id = GetGaiaIdForUsername(username_);
     service()->signin()->SetAuthenticatedAccountInfo(gaia_id, username_);
     std::string account_id = service()->signin()->GetAuthenticatedAccountId();
     service()->GoogleSigninSucceeded(account_id, username_, password_);
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
       UpdateCredentials(account_id, GenerateFakeOAuth2RefreshTokenString());
   } else {
     LOG(ERROR) << "Unsupported profile signin type.";
   }
 
   // Now that auth is completed, request that sync actually start.
   service()->RequestStart();
 
   if (!AwaitBackendInitialization()) {
+    setup_handle_.reset();
     return false;
   }
 
   // Choose the datatypes to be synced. If all datatypes are to be synced,
   // set sync_everything to true; otherwise, set it to false.
   bool sync_everything = (synced_datatypes == syncer::UserSelectableTypes());
   service()->OnUserChoseDatatypes(sync_everything, synced_datatypes);
 
   // Notify ProfileSyncService that we are done with configuration.
   FinishSyncSetup();
@@ skipping 104 matching lines @@
 std::string ProfileSyncServiceHarness::GenerateFakeOAuth2RefreshTokenString() {
   return base::StringPrintf("oauth2_refresh_token_%d",
                             ++oauth2_refesh_token_number_);
 }
 
 bool ProfileSyncServiceHarness::IsSyncDisabled() const {
   return !service()->IsSetupInProgress() && !service()->IsFirstSetupComplete();
 }
 
 void ProfileSyncServiceHarness::FinishSyncSetup() {
-  service()->SetSetupInProgress(false);
+  setup_handle_.reset();
   service()->SetFirstSetupComplete();
 }
 
 SyncSessionSnapshot ProfileSyncServiceHarness::GetLastSessionSnapshot() const {
   DCHECK(service() != NULL) << "Sync service has not yet been set up.";
   if (service()->IsSyncActive()) {
     return service()->GetLastSessionSnapshot();
   }
   return SyncSessionSnapshot();
 }
@@ skipping 147 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   std::unique_ptr<base::DictionaryValue> value(
       sync_driver::sync_ui_util::ConstructAboutInformation(
           service(), service()->signin(), chrome::GetChannel()));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(
       *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status);
   return service_status;
 }