This CL replaces e-mail with AccountId on user selection screen.

chrome/browser/chromeos/login/screens/user_selection_screen.cc

 // Copyright 2014 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/chromeos/login/screens/user_selection_screen.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
@@ skipping 130 matching lines @@
     bool is_signin_to_add,
     AuthType auth_type,
     const std::vector<std::string>* public_session_recommended_locales,
     base::DictionaryValue* user_dict) {
   const bool is_public_session =
       user->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT;
   const bool is_legacy_supervised_user =
       user->GetType() == user_manager::USER_TYPE_SUPERVISED;
   const bool is_child_user = user->GetType() == user_manager::USER_TYPE_CHILD;
 
-  user_dict->SetString(kKeyUsername, user->GetAccountId().GetUserEmail());
+  user_dict->SetString(kKeyUsername, user->GetAccountId().Serialize());
   user_dict->SetString(kKeyEmailAddress, user->display_email());
   user_dict->SetString(kKeyDisplayName, user->GetDisplayName());
   user_dict->SetBoolean(kKeyPublicAccount, is_public_session);
   user_dict->SetBoolean(kKeyLegacySupervisedUser, is_legacy_supervised_user);
   user_dict->SetBoolean(kKeyChildUser, is_child_user);
   user_dict->SetBoolean(kKeyDesktopUser, false);
   user_dict->SetInteger(kKeyInitialAuthType, auth_type);
   user_dict->SetBoolean(kKeySignedIn, user->is_logged_in());
   user_dict->SetBoolean(kKeyIsOwner, is_owner);
 
@@ skipping 77 matching lines @@
   // At this point the reason for invalid token should be already set. If not,
   // this might be a leftover from an old version.
   if (token_status == user_manager::User::OAUTH2_TOKEN_STATUS_INVALID)
     RecordReauthReason(user->GetAccountId(), ReauthReason::OTHER);
 
   return user->force_online_signin() ||
          (token_status == user_manager::User::OAUTH2_TOKEN_STATUS_INVALID) ||
          (token_status == user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN);
 }
 
+// static
+AccountId UserSelectionScreen::GetAccountIdOfKnownUser(
+    const std::string& user_id) {
+  if (user_id.empty())
+    return EmptyAccountId();

[oshima, 2015/11/13 15:45:10]

can this happen? The caller of this seems to access map using return value, and
it may create new empty value for EmptyAccountId(). Is it expected?

[Alexander Alekseev, 2015/11/13 16:04:11]

This happens for me in tests
(For example, when device owner is not set).

+
+  const AccountId initial_account_id(AccountId::FromUserEmail(user_id));
+
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
+  if (!user_manager)
+    return initial_account_id;
+
+  AccountId known_account_id(EmptyAccountId());
+  if (user_manager->GetKnownUserAccountId(initial_account_id,
+                                          &known_account_id))
+    return known_account_id;
+
+  return initial_account_id;
+}
+
 void UserSelectionScreen::SetHandler(LoginDisplayWebUIHandler* handler) {
   handler_ = handler;
 }
 
 void UserSelectionScreen::SetView(UserBoardView* view) {
   view_ = view;
 }
 
 void UserSelectionScreen::Init(const user_manager::UserList& users,
                                bool show_guest) {
@@ skipping 40 matching lines @@
         base::TimeDelta::FromSeconds(kPasswordClearTimeoutSec),
         this,
         &UserSelectionScreen::OnPasswordClearTimerExpired);
   }
   password_clear_timer_.Reset();
 }
 
 // static
 const user_manager::UserList UserSelectionScreen::PrepareUserListForSending(
     const user_manager::UserList& users,
-    std::string owner,
+    const AccountId& owner,
     bool is_signin_to_add) {
   user_manager::UserList users_to_send;
-  bool has_owner = owner.size() > 0;
+  bool has_owner = owner.is_valid();
   size_t max_non_owner_users = has_owner ? kMaxUsers - 1 : kMaxUsers;
   size_t non_owner_count = 0;
 
   for (user_manager::UserList::const_iterator it = users.begin();
        it != users.end();
        ++it) {
-    const std::string& user_id = (*it)->email();
-    bool is_owner = (user_id == owner);
+    bool is_owner = ((*it)->GetAccountId() == owner);
     bool is_public_account =
         ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT);
 
     if ((is_public_account && !is_signin_to_add) || is_owner ||
         (!is_public_account && non_owner_count < max_non_owner_users)) {
 
       if (!is_owner)
         ++non_owner_count;
       if (is_owner && users_to_send.size() > kMaxUsers) {
         // Owner is always in the list.
         users_to_send.insert(users_to_send.begin() + (kMaxUsers - 1), *it);
         while (users_to_send.size() > kMaxUsers)
           users_to_send.erase(users_to_send.begin() + kMaxUsers);
       } else if (users_to_send.size() < kMaxUsers) {
         users_to_send.push_back(*it);
       }
     }
   }
   return users_to_send;
 }
 
 void UserSelectionScreen::SendUserList() {
   base::ListValue users_list;
 
   // TODO(nkostylev): Move to a separate method in UserManager.
   // http://crbug.com/230852
   bool single_user = users_.size() == 1;
   bool is_signin_to_add = LoginDisplayHostImpl::default_host() &&
                           user_manager::UserManager::Get()->IsUserLoggedIn();
-  std::string owner;
-  chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
+  std::string owner_email;
+  chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner,
+                                           &owner_email);
+  const AccountId owner(GetAccountIdOfKnownUser(owner_email));
 
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   bool is_enterprise_managed = connector->IsEnterpriseManaged();
 
   const user_manager::UserList users_to_send =
       PrepareUserListForSending(users_, owner, is_signin_to_add);
 
   user_auth_type_map_.clear();
 
   const std::vector<std::string> kEmptyRecommendedLocales;
   for (user_manager::UserList::const_iterator it = users_to_send.begin();
        it != users_to_send.end();
        ++it) {
-    const std::string& user_id = (*it)->email();
-    bool is_owner = (user_id == owner);
+    const AccountId& account_id = (*it)->GetAccountId();
+    bool is_owner = (account_id == owner);
     const bool is_public_account =
         ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT);
     const AuthType initial_auth_type =
         is_public_account ? EXPAND_THEN_USER_CLICK
                           : (ShouldForceOnlineSignIn(*it) ? ONLINE_SIGN_IN
                                                           : OFFLINE_PASSWORD);
-    user_auth_type_map_[user_id] = initial_auth_type;
+    user_auth_type_map_[account_id] = initial_auth_type;
 
     base::DictionaryValue* user_dict = new base::DictionaryValue();
     const std::vector<std::string>* public_session_recommended_locales =
-        public_session_recommended_locales_.find(user_id) ==
-            public_session_recommended_locales_.end() ?
-                &kEmptyRecommendedLocales :
-                &public_session_recommended_locales_[user_id];
+        public_session_recommended_locales_.find(account_id) ==
+                public_session_recommended_locales_.end()
+            ? &kEmptyRecommendedLocales
+            : &public_session_recommended_locales_[account_id];
     FillUserDictionary(*it,
                        is_owner,
                        is_signin_to_add,
                        initial_auth_type,
                        public_session_recommended_locales,
                        user_dict);
     bool signed_in = (*it)->is_logged_in();
 
     // Single user check here is necessary because owner info might not be
     // available when running into login screen on first boot.
     // See http://crosbug.com/12723
     bool can_remove_user =
-        ((!single_user || is_enterprise_managed) && !user_id.empty() &&
+        ((!single_user || is_enterprise_managed) && account_id.is_valid() &&
          !is_owner && !is_public_account && !signed_in && !is_signin_to_add);
     user_dict->SetBoolean(kKeyCanRemove, can_remove_user);
     users_list.Append(user_dict);
   }
 
   handler_->LoadUsers(users_list, show_guest_);
 }
 
 void UserSelectionScreen::HandleGetUsers() {
   SendUserList();
 }
 
-void UserSelectionScreen::CheckUserStatus(const std::string& user_email) {
+void UserSelectionScreen::CheckUserStatus(const AccountId& account_id) {
   // No checks on lock screen.
   if (ScreenLocker::default_screen_locker())
     return;
 
   if (!token_handle_util_.get()) {
     token_handle_util_.reset(
         new TokenHandleUtil(user_manager::UserManager::Get()));
   }
 
-  const AccountId account_id = AccountId::FromUserEmail(user_email);
   if (token_handle_util_->HasToken(account_id)) {
     token_handle_util_->CheckToken(
         account_id, base::Bind(&UserSelectionScreen::OnUserStatusChecked,
                                weak_factory_.GetWeakPtr()));
   }
 }
 
 void UserSelectionScreen::OnUserStatusChecked(
     const AccountId& account_id,
     TokenHandleUtil::TokenHandleStatus status) {
   if (status == TokenHandleUtil::INVALID) {
     RecordReauthReason(account_id, ReauthReason::INVALID_TOKEN_HANDLE);
     token_handle_util_->MarkHandleInvalid(account_id);
     SetAuthType(account_id.GetUserEmail(), ONLINE_SIGN_IN, base::string16());
   }
 }
 
 // EasyUnlock stuff
 
 void UserSelectionScreen::SetAuthType(const std::string& user_id,
                                       AuthType auth_type,
                                       const base::string16& initial_value) {
-  if (GetAuthType(user_id) == FORCE_OFFLINE_PASSWORD)
+  const AccountId& account_id(GetAccountIdOfKnownUser(user_id));
+  if (GetAuthType(account_id.GetUserEmail()) == FORCE_OFFLINE_PASSWORD)
     return;
-  DCHECK(GetAuthType(user_id) != FORCE_OFFLINE_PASSWORD ||
+  DCHECK(GetAuthType(account_id.GetUserEmail()) != FORCE_OFFLINE_PASSWORD ||
          auth_type == FORCE_OFFLINE_PASSWORD);
-  user_auth_type_map_[user_id] = auth_type;
-  view_->SetAuthType(user_id, auth_type, initial_value);
+  user_auth_type_map_[account_id] = auth_type;
+  view_->SetAuthType(account_id, auth_type, initial_value);
 }
 
 proximity_auth::ScreenlockBridge::LockHandler::AuthType
 UserSelectionScreen::GetAuthType(const std::string& username) const {
-  if (user_auth_type_map_.find(username) == user_auth_type_map_.end())
+  const AccountId& account_id(GetAccountIdOfKnownUser(username));
+  if (user_auth_type_map_.find(account_id) == user_auth_type_map_.end())
     return OFFLINE_PASSWORD;
-  return user_auth_type_map_.find(username)->second;
+  return user_auth_type_map_.find(account_id)->second;
 }
 
 proximity_auth::ScreenlockBridge::LockHandler::ScreenType
 UserSelectionScreen::GetScreenType() const {
   if (display_type_ == OobeUI::kLockDisplay)
     return LOCK_SCREEN;
 
   if (display_type_ == OobeUI::kLoginDisplay)
     return SIGNIN_SCREEN;
 
   return OTHER_SCREEN;
 }
 
 void UserSelectionScreen::ShowBannerMessage(const base::string16& message) {
   view_->ShowBannerMessage(message);
 }
 
 void UserSelectionScreen::ShowUserPodCustomIcon(
     const std::string& user_id,
     const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions&
         icon_options) {
   scoped_ptr<base::DictionaryValue> icon = icon_options.ToDictionaryValue();
   if (!icon || icon->empty())
     return;
-  view_->ShowUserPodCustomIcon(user_id, *icon);
+  const AccountId account_id(GetAccountIdOfKnownUser(user_id));
+  view_->ShowUserPodCustomIcon(account_id, *icon);
 }
 
 void UserSelectionScreen::HideUserPodCustomIcon(const std::string& user_id) {
-  view_->HideUserPodCustomIcon(user_id);
+  const AccountId account_id(GetAccountIdOfKnownUser(user_id));
+  view_->HideUserPodCustomIcon(account_id);
 }
 
 void UserSelectionScreen::EnableInput() {
   // If Easy Unlock fails to unlock the screen, re-enable the password input.
   // This is only necessary on the lock screen, because the error handling for
   // the sign-in screen uses a different code path.
   if (ScreenLocker::default_screen_locker())
     ScreenLocker::default_screen_locker()->EnableInput();
 }
 
 void UserSelectionScreen::Unlock(const std::string& user_email) {
   DCHECK_EQ(GetScreenType(), LOCK_SCREEN);
   ScreenLocker::Hide();
 }
 
 void UserSelectionScreen::AttemptEasySignin(const std::string& user_id,
                                             const std::string& secret,
                                             const std::string& key_label) {
   DCHECK_EQ(GetScreenType(), SIGNIN_SCREEN);
 
-  UserContext user_context(AccountId::FromUserEmail(user_id));
+  UserContext user_context(GetAccountIdOfKnownUser(user_id));
   user_context.SetAuthFlow(UserContext::AUTH_FLOW_EASY_UNLOCK);
   user_context.SetKey(Key(secret));
   user_context.GetKey()->SetLabel(key_label);
 
   login_display_delegate_->Login(user_context, SigninSpecifics());
 }
 
-void UserSelectionScreen::HardLockPod(const std::string& user_id) {
-  view_->SetAuthType(user_id, OFFLINE_PASSWORD, base::string16());
-  EasyUnlockService* service = GetEasyUnlockServiceForUser(user_id);
+void UserSelectionScreen::HardLockPod(const AccountId& account_id) {
+  view_->SetAuthType(account_id, OFFLINE_PASSWORD, base::string16());
+  EasyUnlockService* service = GetEasyUnlockServiceForUser(account_id);
   if (!service)
     return;
   service->SetHardlockState(EasyUnlockScreenlockStateHandler::USER_HARDLOCK);
 }
 
-void UserSelectionScreen::AttemptEasyUnlock(const std::string& user_id) {
-  EasyUnlockService* service = GetEasyUnlockServiceForUser(user_id);
+void UserSelectionScreen::AttemptEasyUnlock(const AccountId& account_id) {
+  EasyUnlockService* service = GetEasyUnlockServiceForUser(account_id);
   if (!service)
     return;
-  service->AttemptAuth(user_id);
+  service->AttemptAuth(account_id.GetUserEmail());
 }
 
-void UserSelectionScreen::RecordClickOnLockIcon(const std::string& user_id) {
-  EasyUnlockService* service = GetEasyUnlockServiceForUser(user_id);
+void UserSelectionScreen::RecordClickOnLockIcon(const AccountId& account_id) {
+  EasyUnlockService* service = GetEasyUnlockServiceForUser(account_id);
   if (!service)
     return;
   service->RecordClickOnLockIcon();
 }
 
 EasyUnlockService* UserSelectionScreen::GetEasyUnlockServiceForUser(
-    const std::string& user_id) const {
+    const AccountId& account_id) const {
   if (GetScreenType() == OTHER_SCREEN)
     return nullptr;
 
   const user_manager::User* unlock_user = nullptr;
   for (const user_manager::User* user : users_) {
-    if (user->email() == user_id) {
+    if (user->GetAccountId() == account_id) {
       unlock_user = user;
       break;
     }
   }
   if (!unlock_user)
     return nullptr;
 
   ProfileHelper* profile_helper = ProfileHelper::Get();
   Profile* profile = profile_helper->GetProfileByUser(unlock_user);
 
   // The user profile should exist if and only if this is the lock screen.
   DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN);
 
   if (!profile)
     profile = profile_helper->GetSigninProfile();
 
   return EasyUnlockService::Get(profile);
 }
 
 }  // namespace chromeos