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

chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.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 "ash/test/ash_test_base.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/proximity_auth/screenlock_bridge.h"
-#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const size_t kMaxUsers = 18; // same as in user_selection_screen.cc
 const char* kOwner = "owner@gmail.com";
 const char* kUsersPublic[] = {"public0@gmail.com", "public1@gmail.com"};
 const char* kUsers[] = {
     "a0@gmail.com", "a1@gmail.com", "a2@gmail.com", "a3@gmail.com",
@@ skipping 53 matching lines @@
       user_auth_type_map;
   scoped_ptr<MultiProfileUserController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninPrepareUserListTest);
 };
 
 TEST_F(SigninPrepareUserListTest, AlwaysKeepOwnerInList) {
   EXPECT_LT(kMaxUsers, fake_user_manager_->GetUsers().size());
   user_manager::UserList users_to_send =
       UserSelectionScreen::PrepareUserListForSending(
-          fake_user_manager_->GetUsers(), AccountId::FromUserEmail(kOwner),
-          true /* is signin to add */);
+          fake_user_manager_->GetUsers(), kOwner, true /* is signin to add */);
 
   EXPECT_EQ(kMaxUsers, users_to_send.size());
   EXPECT_EQ(kOwner, users_to_send.back()->email());
 
   fake_user_manager_->RemoveUserFromList(
       AccountId::FromUserEmail("a16@gmail.com"));
   fake_user_manager_->RemoveUserFromList(
       AccountId::FromUserEmail("a17@gmail.com"));
   users_to_send = UserSelectionScreen::PrepareUserListForSending(
-      fake_user_manager_->GetUsers(), AccountId::FromUserEmail(kOwner),
+      fake_user_manager_->GetUsers(),
+      kOwner,
       true /* is signin to add */);
 
   EXPECT_EQ(kMaxUsers, users_to_send.size());
   EXPECT_EQ("a18@gmail.com", users_to_send.back()->email());
   EXPECT_EQ(kOwner, users_to_send[kMaxUsers-2]->email());
 }
 
 TEST_F(SigninPrepareUserListTest, PublicAccounts) {
   user_manager::UserList users_to_send =
       UserSelectionScreen::PrepareUserListForSending(
-          fake_user_manager_->GetUsers(), AccountId::FromUserEmail(kOwner),
-          true /* is signin to add */);
+          fake_user_manager_->GetUsers(), kOwner, true /* is signin to add */);
 
   EXPECT_EQ(kMaxUsers, users_to_send.size());
   EXPECT_EQ("a0@gmail.com", users_to_send.front()->email());
 
   users_to_send = UserSelectionScreen::PrepareUserListForSending(
-      fake_user_manager_->GetUsers(), AccountId::FromUserEmail(kOwner),
+      fake_user_manager_->GetUsers(),
+      kOwner,
       false /* is signin to add */);
 
   EXPECT_EQ(kMaxUsers, users_to_send.size());
   EXPECT_EQ("public0@gmail.com", users_to_send.front()->email());
 }
 
 }  // namespace chromeos