Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

Index: chrome/browser/ui/sync/one_click_signin_sync_starter.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
index ad9d1f29b4201f1990774b6f12771febed8ace9b..9c347baa287718c2ce0f9f0063f11904ebbe8513 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -73,6 +73,7 @@ void SetUserChoiceHistogram(SigninChoice choice) {
 OneClickSigninSyncStarter::OneClickSigninSyncStarter(
     Profile* profile,
     Browser* browser,
+    const std::string& gaia_id,
     const std::string& email,
     const std::string& password,
     const std::string& refresh_token,
@@ -98,7 +99,7 @@ OneClickSigninSyncStarter::OneClickSigninSyncStarter(
   // before signin completes.
   SigninManagerFactory::GetForProfile(profile_)->
       StartSignInWithRefreshToken(
-          refresh_token, email, password,
+          refresh_token, gaia_id, email, password,
           base::Bind(&OneClickSigninSyncStarter::ConfirmSignin,
                      weak_pointer_factory_.GetWeakPtr()));
 }
@@ -149,7 +150,7 @@ void OneClickSigninSyncStarter::Initialize(Profile* profile, Browser* browser) {
 void OneClickSigninSyncStarter::ConfirmSignin(const std::string& oauth_token) {
   DCHECK(!oauth_token.empty());
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
-  // If this is a new signin (no authenticated username yet) try loading
+  // If this is a new signin (no account authenticated yet) try loading
   // policy for this user now, before any signed in services are initialized.
   if (!signin->IsAuthenticated()) {
 #if defined(ENABLE_CONFIGURATION_POLICY)