Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

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 19 matching lines @@
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/sync_driver/data_type_controller.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "sync/internal_api/public/base/progress_marker_map.h"
 #include "sync/internal_api/public/util/sync_string_conversions.h"
 
 using syncer::sessions::SyncSessionSnapshot;
 
 namespace {
 
+std::string GetGaiaIdForUsername(const std::string& username) {
+  return "gaia-id-" + username;
+}
+
 bool HasAuthError(ProfileSyncService* service) {
   return service->GetAuthError().state() ==
              GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
          service->GetAuthError().state() ==
              GoogleServiceAuthError::SERVICE_ERROR ||
          service->GetAuthError().state() ==
              GoogleServiceAuthError::REQUEST_CANCELED;
 }
 
 class BackendInitializeChecker : public SingleClientStatusChangeChecker {
@@ skipping 98 matching lines @@
   // 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);
 
+  // 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_);
+
   DCHECK(!username_.empty());
   if (signin_type_ == SigninType::UI_SIGNIN) {
     Browser* browser =
         FindBrowserWithProfile(profile_, chrome::GetActiveDesktop());
     DCHECK(browser);
     if (!login_ui_test_utils::SignInWithUI(browser, username_, password_)) {
       LOG(ERROR) << "Could not sign in to GAIA servers.";
       return false;
     }
   } else if (signin_type_ == SigninType::FAKE_SIGNIN) {
     // Authenticate sync client using GAIA credentials.
-    service()->signin()->SetAuthenticatedUsername(username_);
-    service()->GoogleSigninSucceeded(username_, username_, password_);
+    service()->signin()->SetAuthenticatedAccountInfo(gaia_id, username_);
+    service()->GoogleSigninSucceeded(account_id, username_, password_);
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
-      UpdateCredentials(username_, GenerateFakeOAuth2RefreshTokenString());
+      UpdateCredentials(account_id, GenerateFakeOAuth2RefreshTokenString());
   } else {
     LOG(ERROR) << "Unsupported profile signin type.";
   }
 
   if (!AwaitBackendInitialization()) {
     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.
@@ skipping 278 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   scoped_ptr<base::DictionaryValue> value(
       sync_ui_util::ConstructAboutInformation(service()));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(value.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &service_status);
   return service_status;
 }