patch from issue 473153002

chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.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/chromeos/login/inline_login_handler_chromeos.h"
 
 #include "chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/common/url_constants.h"
+#include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 
 namespace chromeos {
@@ skipping 41 matching lines @@
 void InlineLoginHandlerChromeOS::CompleteLogin(const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
 
   const base::DictionaryValue* dict = NULL;
   args->GetDictionary(0, &dict);
 
   std::string session_index;
   dict->GetString("sessionIndex", &session_index);
   CHECK(!session_index.empty()) << "Session index is empty.";
 
-  std::string account_id;
-  dict->GetString("email", &account_id);
-  CHECK(!account_id.empty()) << "Account ID is empty.";
+  std::string email;
+  dict->GetString("email", &email);
+  CHECK(!email.empty()) << "Email is empty.";
+
+  std::string gaia_id;
+  dict->GetString("gaiaId", &gaia_id);
+  CHECK(!gaia_id.empty()) << "Gaia ID is empty.";
+
+  AccountTrackerService* account_tracker =
+      AccountTrackerServiceFactory::GetForProfile(profile);
+  std::string account_id =
+      account_tracker->PickAccountIdForAccount(gaia_id, email);
+  account_tracker->SeedAccountInfo(account_id, gaia_id, email);
 
   oauth2_delegate_.reset(new InlineLoginUIOAuth2Delegate(web_ui(), account_id));
   net::URLRequestContextGetter* request_context =
       content::BrowserContext::GetStoragePartitionForSite(
           profile, GURL(chrome::kChromeUIChromeSigninURL))
           ->GetURLRequestContext();
   oauth2_token_fetcher_.reset(
       new OAuth2TokenFetcher(oauth2_delegate_.get(), request_context));
   SigninClient* signin_client =
       ChromeSigninClientFactory::GetForProfile(profile);
   std::string signin_scoped_device_id =
       signin_client->GetSigninScopedDeviceId();
   oauth2_token_fetcher_->StartExchangeFromCookies(session_index,
                                                   signin_scoped_device_id);
 }
 
 } // namespace chromeos