ChromeOS: This CL fixes bug in UserManager::GetKnownUserAccountId .

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.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/gaia_screen_handler.h"
 
 #include "ash/system/chromeos/devicetype_utils.h"
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
@@ skipping 431 matching lines @@
       NetworkError::ERROR_REASON_FRAME_ERROR;
   frame_state_ = FRAME_STATE_ERROR;
   UpdateState(error_reason);
 }
 
 AccountId GaiaScreenHandler::GetAccountId(
     const std::string& authenticated_email,
     const std::string& gaia_id) const {
   const std::string canonicalized_email =
       gaia::CanonicalizeEmail(gaia::SanitizeEmail(authenticated_email));
-  const AccountId authenticated_account_id(
-      AccountId::FromUserEmailGaiaId(canonicalized_email, gaia_id));
 
-  // If we don't have UserManager instance (i.e. we are in unit test),
-  // or a known user has authenticated, just log in.
-  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
-  if (!user_manager || user_manager->IsKnownUser(authenticated_account_id))
-    return authenticated_account_id;
+  const AccountId account_id = user_manager::UserManager::GetKnownUserAccountId(
+      authenticated_email, gaia_id);
 
-  // If [part of] user id has changed, update stored data and connect user
-  // to existing home directory.
-  AccountId old_account_id(EmptyAccountId());
-  if (!user_manager->GetKnownUserAccountId(authenticated_account_id,
-                                           &old_account_id)) {
-    return authenticated_account_id;
+  if (account_id.GetUserEmail() != canonicalized_email) {
+    LOG(WARNING) << "Existing user '" << account_id.GetUserEmail()
+                 << "' authenticated by alias '" << canonicalized_email << "'.";
   }
 
-  if (old_account_id.GetUserEmail() != canonicalized_email) {
-    LOG(WARNING) << "Existing user '" << old_account_id.GetUserEmail()
-                 << "' authenticated by alias '" << canonicalized_email << "'.";
-    return old_account_id;
-  }
-
-  return authenticated_account_id;
+  return account_id;
 }
 
 void GaiaScreenHandler::HandleCompleteAuthentication(
     const std::string& gaia_id,
     const std::string& email,
     const std::string& password,
     const std::string& auth_code,
     bool using_saml,
     const std::string& gaps_cookie) {
   if (!Delegate())
@@ skipping 405 matching lines @@
 bool GaiaScreenHandler::IsRestrictiveProxy() const {
   return !disable_restrictive_proxy_check_for_test_ &&
          !IsOnline(captive_portal_status_);
 }
 
 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
   disable_restrictive_proxy_check_for_test_ = true;
 }
 
 }  // namespace chromeos