Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

Index: chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
index af92e1fc157fe3c5cb5a3c7128a72175c94c1519..d56bd09ceae76f7835bffde388839b634c1c4d2a 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -306,13 +306,11 @@ void InlineSigninHelper::OnClientOAuthSuccess(const ClientOAuthResult& result) {
       AboutSigninInternalsFactory::GetForProfile(profile_);
   about_signin_internals->OnRefreshTokenReceived("Successful");
 
+  // Prime the account tracker with this combination of gaia id/display email.
   AccountTrackerService* account_tracker =
       AccountTrackerServiceFactory::GetForProfile(profile_);
   std::string account_id =
-      account_tracker->PickAccountIdForAccount(gaia_id_, email_);
-
-  // Prime the account tracker with this combination of gaia id/display email.
-  account_tracker->SeedAccountInfo(gaia_id_, email_);
+      account_tracker->SeedAccountInfo(gaia_id_, email_);

[Mike Lerman, 2015/04/08 14:45:26]

nit: don't need to create a local account_tracker variable: just do std::string
account_id =
AccountTrackerServiceFactory::GetForProfile(profile_)->SeedAccountInfo(gaia_id_,
email_)

[Roger Tawa OOO till Jul 10th, 2015/04/08 20:24:21]

Done.

 
   signin_metrics::Source source = signin::GetSourceForPromoURL(current_url_);
 
@@ -387,7 +385,7 @@ void InlineSigninHelper::OnClientOAuthSuccess(const ClientOAuthResult& result) {
       // OneClickSigninSyncStarter will delete itself once the job is done.
       new OneClickSigninSyncStarter(
           profile_, browser,
-          email_, password_, result.refresh_token,
+          gaia_id_, email_, password_, result.refresh_token,
           start_mode,
           contents,
           confirmation_required,
@@ -448,7 +446,7 @@ void InlineSigninHelper::ConfirmEmailAction(
       break;
     case ConfirmEmailDialogDelegate::START_SYNC:
       new OneClickSigninSyncStarter(
-          profile_, browser, email_, password_, refresh_token,
+          profile_, browser, gaia_id_, email_, password_, refresh_token,
           start_mode, web_contents, confirmation_required, GURL(),
           base::Bind(&InlineLoginHandlerImpl::SyncStarterCallback, handler_));
       break;