Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/ui/webui/signin/inline_login_handler_impl.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/ui/webui/signin/inline_login_handler_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 288 matching lines @@
   Browser* browser = NULL;
   if (handler_) {
     contents = handler_->web_ui()->GetWebContents();
     browser = handler_->GetDesktopBrowser();
   }
 
   AboutSigninInternals* about_signin_internals =
       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_);
 
   SigninManager* signin_manager = SigninManagerFactory::GetForProfile(profile_);
   std::string primary_email = signin_manager->GetAuthenticatedUsername();
   if (gaia::AreEmailsSame(email_, primary_email) &&
       source == signin_metrics::SOURCE_REAUTH &&
       switches::IsNewProfileManagement() &&
       !password_.empty() &&
       profiles::IsLockAvailable(profile_)) {
@@ skipping 54 matching lines @@
               OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
     }
 
     bool start_signin = !HandleCrossAccountError(result.refresh_token, source,
         confirmation_required, start_mode);
     if (start_signin) {
       // Call OneClickSigninSyncStarter to exchange oauth code for tokens.
       // 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,
           signin::GetNextPageURLForPromoURL(current_url_),
           base::Bind(&InlineLoginHandlerImpl::SyncStarterCallback, handler_));
       base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
     }
   }
 }
 
@@ skipping 40 matching lines @@
     case ConfirmEmailDialogDelegate::CREATE_NEW_USER:
       if (handler_) {
         handler_->SyncStarterCallback(
             OneClickSigninSyncStarter::SYNC_SETUP_FAILURE);
       }
       chrome::ShowSettingsSubPage(browser,
                                   std::string(chrome::kCreateProfileSubPage));
       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;
     case ConfirmEmailDialogDelegate::CLOSE:
       if (handler_) {
         handler_->SyncStarterCallback(
             OneClickSigninSyncStarter::SYNC_SETUP_FAILURE);
       }
       break;
     default:
@@ skipping 313 matching lines @@
       }
     }
 
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
             BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
             signin::ManageAccountsParams());
     }
   }
 }