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

chrome/browser/ui/webui/options/chromeos/shared_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/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 68 matching lines @@
   { kStatsReportingPref, true, true },
   { prefs::kSpellCheckUseSpellingService, false, false },
 #endif
 };
 
 }  // namespace
 
 class SharedOptionsTest : public LoginManagerTest {
  public:
   SharedOptionsTest()
-      : LoginManagerTest(false),
-        device_settings_provider_(NULL),
-        test_owner_account_id_(AccountId::FromUserEmail(kTestOwner)),
-        test_non_owner_account_id_(AccountId::FromUserEmail(kTestNonOwner)) {
+    : LoginManagerTest(false),
+      device_settings_provider_(NULL) {
     stub_settings_provider_.Set(kDeviceOwner, base::StringValue(kTestOwner));
   }
 
   ~SharedOptionsTest() override {}
 
   void SetUpOnMainThread() override {
     LoginManagerTest::SetUpOnMainThread();
 
     CrosSettings* settings = CrosSettings::Get();
 
@@ skipping 158 matching lines @@
         !is_owner);
     ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
         contents, js_expression, &success));
     EXPECT_TRUE(success) << "Accounts overlay incorrect for " <<
         (is_owner ? "owner." : "non-owner.");
   }
 
   StubAccountSettingsProvider stub_settings_provider_;
   CrosSettingsProvider* device_settings_provider_;
 
-  const AccountId test_owner_account_id_;
-  const AccountId test_non_owner_account_id_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(SharedOptionsTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SharedOptionsTest, PRE_SharedOptions) {
-  RegisterUser(test_owner_account_id_.GetUserEmail());
-  RegisterUser(test_non_owner_account_id_.GetUserEmail());
+  RegisterUser(kTestOwner);
+  RegisterUser(kTestNonOwner);
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(SharedOptionsTest, SharedOptions) {
   // Log in the owner first, then add a secondary user.
-  LoginUser(test_owner_account_id_.GetUserEmail());
+  LoginUser(kTestOwner);
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
-  AddUser(test_non_owner_account_id_.GetUserEmail());
+  AddUser(kTestNonOwner);
 
   user_manager::UserManager* manager = user_manager::UserManager::Get();
   ASSERT_EQ(2u, manager->GetLoggedInUsers().size());
   {
     SCOPED_TRACE("Checking settings for owner, primary user.");
-    CheckOptionsUI(manager->FindUser(manager->GetOwnerAccountId()), true, true);
+    CheckOptionsUI(manager->FindUser(manager->GetOwnerEmail()), true, true);
   }
   {
     SCOPED_TRACE("Checking settings for non-owner, secondary user.");
-    CheckOptionsUI(manager->FindUser(test_non_owner_account_id_), false, false);
+    CheckOptionsUI(manager->FindUser(kTestNonOwner), false, false);
   }
   // TODO(michaelpg): Add tests for non-primary owner and primary non-owner
   // when the owner-only multiprofile restriction is removed, probably M38.
 }
 
 IN_PROC_BROWSER_TEST_F(SharedOptionsTest, PRE_ScreenLockPreferencePrimary) {
-  RegisterUser(test_owner_account_id_.GetUserEmail());
-  RegisterUser(test_non_owner_account_id_.GetUserEmail());
+  RegisterUser(kTestOwner);
+  RegisterUser(kTestNonOwner);
   StartupUtils::MarkOobeCompleted();
 }
 
 // Tests the shared setting indicator for the primary user's auto-lock setting
 // when the secondary user has enabled or disabled their preference.
 // (The checkbox is unset if the current user's preference is false, but if any
 // other signed-in user has enabled this preference, the shared setting
 // indicator explains this.)
 IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferencePrimary) {
-  LoginUser(test_owner_account_id_.GetUserEmail());
+  LoginUser(kTestOwner);
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
-  AddUser(test_non_owner_account_id_.GetUserEmail());
+  AddUser(kTestNonOwner);
 
   user_manager::UserManager* manager = user_manager::UserManager::Get();
-  const user_manager::User* user1 = manager->FindUser(test_owner_account_id_);
-  const user_manager::User* user2 =
-      manager->FindUser(test_non_owner_account_id_);
+  const user_manager::User* user1 = manager->FindUser(kTestOwner);
+  const user_manager::User* user2 = manager->FindUser(kTestNonOwner);
 
   PrefService* prefs1 =
       ProfileHelper::Get()->GetProfileByUserUnsafe(user1)->GetPrefs();
   PrefService* prefs2 =
       ProfileHelper::Get()->GetProfileByUserUnsafe(user2)->GetPrefs();
 
   // Set both users' preference to false, then change the secondary user's to
   // true. We'll do the opposite in the next test. Doesn't provide 100% coverage
   // but reloading the settings page is super slow on debug builds.
   prefs1->SetBoolean(prefs::kEnableAutoScreenLock, false);
@@ skipping 32 matching lines @@
   prefs1->SetBoolean(prefs::kEnableAutoScreenLock, true);
   {
     SCOPED_TRACE("Screen lock true for both users");
     expected_value = true;
     CheckBooleanPreference(contents, prefs::kEnableAutoScreenLock, disabled,
                            empty_controlled, expected_value);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(SharedOptionsTest, PRE_ScreenLockPreferenceSecondary) {
-  RegisterUser(test_owner_account_id_.GetUserEmail());
-  RegisterUser(test_non_owner_account_id_.GetUserEmail());
+  RegisterUser(kTestOwner);
+  RegisterUser(kTestNonOwner);
   StartupUtils::MarkOobeCompleted();
 }
 
 // Tests the shared setting indicator for the secondary user's auto-lock setting
 // when the primary user has enabled or disabled their preference.
 // (The checkbox is unset if the current user's preference is false, but if any
 // other signed-in user has enabled this preference, the shared setting
 // indicator explains this.)
 IN_PROC_BROWSER_TEST_F(SharedOptionsTest, ScreenLockPreferenceSecondary) {
-  LoginUser(test_owner_account_id_.GetUserEmail());
+  LoginUser(kTestOwner);
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
-  AddUser(test_non_owner_account_id_.GetUserEmail());
+  AddUser(kTestNonOwner);
 
   user_manager::UserManager* manager = user_manager::UserManager::Get();
-  const user_manager::User* user1 = manager->FindUser(test_owner_account_id_);
-  const user_manager::User* user2 =
-      manager->FindUser(test_non_owner_account_id_);
+  const user_manager::User* user1 = manager->FindUser(kTestOwner);
+  const user_manager::User* user2 = manager->FindUser(kTestNonOwner);
 
   PrefService* prefs1 =
       ProfileHelper::Get()->GetProfileByUserUnsafe(user1)->GetPrefs();
   PrefService* prefs2 =
       ProfileHelper::Get()->GetProfileByUserUnsafe(user2)->GetPrefs();
 
   // Set both users' preference to true, then change the secondary user's to
   // false.
   prefs1->SetBoolean(prefs::kEnableAutoScreenLock, true);
   prefs2->SetBoolean(prefs::kEnableAutoScreenLock, true);
@@ skipping 31 matching lines @@
   content::WaitForLoadStop(contents);
   {
     SCOPED_TRACE("Screen lock false for both users");
     expected_value = false;
     CheckBooleanPreference(contents, prefs::kEnableAutoScreenLock, disabled,
                            empty_controlled, expected_value);
   }
 }
 
 }  // namespace chromeos