This CL replaces e-mail with AccountId in easy signin code.

chrome/browser/chromeos/login/users/chrome_user_manager_impl.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/users/chrome_user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 718 matching lines @@
 
   GetUserImageManager(account_id)->UserLoggedIn(IsCurrentUserNew(), true);
   WallpaperManager::Get()->EnsureLoggedInUserWallpaperLoaded();
 
   // Make sure that new data is persisted to Local State.
   GetLocalState()->CommitPendingWrite();
 }
 
 bool ChromeUserManagerImpl::HasPendingBootstrap(
     const AccountId& account_id) const {
-  return bootstrap_manager_->HasPendingBootstrap(account_id.GetUserEmail());
+  return bootstrap_manager_->HasPendingBootstrap(account_id);
 }
 
 void ChromeUserManagerImpl::PublicAccountUserLoggedIn(
     user_manager::User* user) {
   SetIsCurrentUserNew(true);
   active_user_ = user;
 
   // The UserImageManager chooses a random avatar picture when a user logs in
   // for the first time. Tell the UserImageManager that this user is not new to
   // prevent the avatar from getting changed.
@@ skipping 107 matching lines @@
     const AccountId& account_id) {
   ChromeUserManager::RemoveNonCryptohomeData(account_id);
 
   WallpaperManager::Get()->RemoveUserWallpaperInfo(account_id.GetUserEmail());
   GetUserImageManager(account_id)->DeleteUserImage();
 
   supervised_user_manager_->RemoveNonCryptohomeData(account_id.GetUserEmail());
 
   multi_profile_user_controller_->RemoveCachedValues(account_id.GetUserEmail());
 
-  EasyUnlockService::ResetLocalStateForUser(account_id.GetUserEmail());
+  EasyUnlockService::ResetLocalStateForUser(account_id);
 }
 
 void
 ChromeUserManagerImpl::CleanUpPublicAccountNonCryptohomeDataPendingRemoval() {
   PrefService* local_state = GetLocalState();
   const std::string public_account_pending_data_removal =
       local_state->GetString(kPublicAccountPendingDataRemoval);
   if (public_account_pending_data_removal.empty() ||
       (IsUserLoggedIn() &&
        public_account_pending_data_removal == GetActiveUser()->email())) {
@@ skipping 209 matching lines @@
   ChromeUserManager::NotifyUserAddedToSession(added_user, user_switch_pending);
 }
 
 void ChromeUserManagerImpl::OnUserNotAllowed(const std::string& user_email) {
   LOG(ERROR) << "Shutdown session because a user is not allowed to be in the "
                 "current session";
   chromeos::ShowMultiprofilesSessionAbortedDialog(user_email);
 }
 
 void ChromeUserManagerImpl::RemovePendingBootstrapUser(
-    const std::string& user_id) {
-  const AccountId account_id(AccountId::FromUserEmail(user_id));
+    const AccountId& account_id) {
   DCHECK(HasPendingBootstrap(account_id));
   RemoveNonOwnerUserInternal(account_id, nullptr);
 }
 
 void ChromeUserManagerImpl::UpdateNumberOfUsers() {
   size_t users = GetLoggedInUsers().size();
   if (users) {
     // Write the user number as UMA stat when a multi user session is possible.
     if ((users + GetUsersAllowedForMultiProfile().size()) > 1)
       ash::MultiProfileUMA::RecordUserCount(users);
@@ skipping 77 matching lines @@
       new base::StringValue(account_id.GetUserEmail()));
 }
 
 void ChromeUserManagerImpl::RemoveReportingUser(const AccountId& account_id) {
   ListPrefUpdate users_update(GetLocalState(), kReportingUsers);
   users_update->Remove(
       base::StringValue(FullyCanonicalize(account_id.GetUserEmail())), NULL);
 }
 
 }  // namespace chromeos