Rename UserInfo method GetEmail to GetDisplayEmail.

components/user_manager/fake_user_manager.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 "components/user_manager/fake_user_manager.h"
 
+#include <algorithm>
+
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/sys_info.h"
 #include "base/task_runner.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user_names.h"
 #include "components/user_manager/user_type.h"
 
 namespace {
 
@@ skipping 29 matching lines @@
 const user_manager::User* FakeUserManager::AddUserWithAffiliation(
     const AccountId& account_id,
     bool is_affiliated) {
   user_manager::User* user = user_manager::User::CreateRegularUser(account_id);
   user->SetAffiliation(is_affiliated);
   users_.push_back(user);
   return user;
 }
 
 void FakeUserManager::RemoveUserFromList(const AccountId& account_id) {
-  user_manager::UserList::iterator it = users_.begin();
-  // TODO (alemate): Chenge this to GetAccountId(), once a real AccountId is
-  // passed. crbug.com/546876
-  while (it != users_.end() && (*it)->GetEmail() != account_id.GetUserEmail())
-    ++it;
+  const user_manager::UserList::iterator it =
+      std::find_if(users_.begin(), users_.end(),
+                   [&account_id](const user_manager::User* user) {
+                     return user->GetAccountId() == account_id;
+                   });
   if (it != users_.end()) {
     if (primary_user_ == *it)
       primary_user_ = nullptr;
     if (active_user_ != *it)
       delete *it;
     users_.erase(it);
   }
 }
 
 const user_manager::UserList& FakeUserManager::GetUsers() const {
@@ skipping 56 matching lines @@
 user_manager::User* FakeUserManager::GetActiveUser() {
   return GetActiveUserInternal();
 }
 
 void FakeUserManager::SwitchActiveUser(const AccountId& account_id) {}
 
 void FakeUserManager::SaveUserDisplayName(const AccountId& account_id,
                                           const base::string16& display_name) {
   for (user_manager::UserList::iterator it = users_.begin(); it != users_.end();
        ++it) {
-    // TODO (alemate): Chenge this to GetAccountId(), once a real AccountId is
-    // passed. crbug.com/546876
-    if ((*it)->GetEmail() == account_id.GetUserEmail()) {
+    if ((*it)->GetAccountId() == account_id) {
       (*it)->set_display_name(display_name);
       return;
     }
   }
 }
 
 const user_manager::UserList& FakeUserManager::GetLRULoggedInUsers() const {
   return users_;
 }
 
@@ skipping 206 matching lines @@
   NOTIMPLEMENTED();
   return;
 }
 
 bool FakeUserManager::IsValidDefaultUserImageId(int image_index) const {
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace user_manager