Revert of This CL replaces user_manager::UserID with AccountId.

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 "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"
@@ skipping 31 matching lines @@
 
   void SetUp() override {
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
     controller_.reset(new MultiProfileUserController(
         this, TestingBrowserProcess::GetGlobal()->local_state()));
     fake_user_manager_->set_multi_profile_user_controller(controller_.get());
 
     for (size_t i = 0; i < arraysize(kUsersPublic); ++i)
-      fake_user_manager_->AddPublicAccountUser(
-          AccountId::FromUserEmail(kUsersPublic[i]));
+      fake_user_manager_->AddPublicAccountUser(kUsersPublic[i]);
 
     for (size_t i = 0; i < arraysize(kUsers); ++i)
-      fake_user_manager_->AddUser(AccountId::FromUserEmail(kUsers[i]));
+      fake_user_manager_->AddUser(kUsers[i]);
 
-    fake_user_manager_->set_owner_id(AccountId::FromUserEmail(kOwner));
+    fake_user_manager_->set_owner_email(kOwner);
   }
 
   void TearDown() override {
     controller_.reset();
     profile_manager_.reset();
   }
 
   // MultiProfileUserControllerDelegate overrides:
   void OnUserNotAllowed(const std::string& user_email) override {}
 
   FakeChromeUserManager* fake_user_manager_;
   ScopedUserManagerEnabler user_manager_enabler_;
   scoped_ptr<TestingProfileManager> profile_manager_;
   std::map<std::string, proximity_auth::ScreenlockBridge::LockHandler::AuthType>
       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(), 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"));
+  fake_user_manager_->RemoveUserFromList("a16@gmail.com");
+  fake_user_manager_->RemoveUserFromList("a17@gmail.com");
   users_to_send = UserSelectionScreen::PrepareUserListForSending(
       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(), 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(),
       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