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

chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.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/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 19 matching lines @@
 const char* kTestUsers[] = { "test-user1@gmail.com", "test-user2@gmail.com" };
 
 }  // namespace
 
 class AccountsOptionsTest : public LoginManagerTest {
  public:
   AccountsOptionsTest()
     : LoginManagerTest(false),
       device_settings_provider_(NULL) {
     stub_settings_provider_.Set(kDeviceOwner, base::StringValue(kTestUsers[0]));
-    for (size_t i = 0; i < arraysize(kTestUsers); ++i) {
-      test_users_.push_back(AccountId::FromUserEmail(kTestUsers[i]));
-    }
   }
 
   ~AccountsOptionsTest() override {}
 
   void SetUpOnMainThread() override {
     LoginManagerTest::SetUpOnMainThread();
     CrosSettings* settings = CrosSettings::Get();
     device_settings_provider_ = settings->GetProvider(kDeviceOwner);
     settings->RemoveSettingsProvider(device_settings_provider_);
     settings->AddSettingsProvider(&stub_settings_provider_);
@@ skipping 60 matching lines @@
     ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
         contents,
         "var e = document.getElementById('useWhitelistCheck');"
         "window.domAutomationController.send(!e.disabled);",
         &whitelist_enabled));
     EXPECT_EQ(is_owner, whitelist_enabled);
   }
 
   StubCrosSettingsProvider stub_settings_provider_;
   CrosSettingsProvider* device_settings_provider_;
-  std::vector<AccountId> test_users_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AccountsOptionsTest);
 };
 
 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, PRE_MultiProfilesAccountsOptions) {
-  RegisterUser(test_users_[0].GetUserEmail());
-  RegisterUser(test_users_[1].GetUserEmail());
+  RegisterUser(kTestUsers[0]);
+  RegisterUser(kTestUsers[1]);
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(AccountsOptionsTest, MultiProfilesAccountsOptions) {
-  LoginUser(test_users_[0].GetUserEmail());
+  LoginUser(kTestUsers[0]);
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
-  AddUser(test_users_[1].GetUserEmail());
+  AddUser(kTestUsers[1]);
 
   user_manager::UserManager* manager = user_manager::UserManager::Get();
   ASSERT_EQ(2u, manager->GetLoggedInUsers().size());
 
-  CheckAccountsUI(manager->FindUser(test_users_[0]), true /* is_owner */);
-  CheckAccountsUI(manager->FindUser(test_users_[1]), false /* is_owner */);
+  CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */);
+  CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */);
 }
 
 }  // namespace chromeos