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

chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 243 matching lines @@
         *braille_controller_.GetDisplayState());
   }
 
   int default_autoclick_delay() const { return default_autoclick_delay_; }
 
   int default_autoclick_delay_;
 
   content::NotificationRegistrar registrar_;
 
   MockBrailleController braille_controller_;
-
-  const AccountId test_account_id_ = AccountId::FromUserEmail(kTestUserName);
-
   DISALLOW_COPY_AND_ASSIGN(AccessibilityManagerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, Login) {
   // Confirms that a11y features are disabled on the login screen.
   EXPECT_FALSE(IsLargeCursorEnabled());
   EXPECT_FALSE(IsSpokenFeedbackEnabled());
   EXPECT_FALSE(IsHighContrastEnabled());
   EXPECT_FALSE(IsAutoclickEnabled());
   EXPECT_FALSE(IsVirtualKeyboardEnabled());
   EXPECT_EQ(default_autoclick_delay(), GetAutoclickDelay());
 
   // Logs in.
-  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
-                                                 kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(
+      kTestUserName, kTestUserName, true);
 
   // Confirms that the features still disabled just after login.
   EXPECT_FALSE(IsLargeCursorEnabled());
   EXPECT_FALSE(IsSpokenFeedbackEnabled());
   EXPECT_FALSE(IsHighContrastEnabled());
   EXPECT_FALSE(IsAutoclickEnabled());
   EXPECT_FALSE(IsVirtualKeyboardEnabled());
   EXPECT_EQ(default_autoclick_delay(), GetAutoclickDelay());
 
   user_manager::UserManager::Get()->SessionStarted();
@@ skipping 40 matching lines @@
   EXPECT_FALSE(IsSpokenFeedbackEnabled());
 
   // Signal the accessibility manager that a braille display was connected.
   SetBrailleDisplayAvailability(true);
   // Confirms that the spoken feedback is enabled.
   EXPECT_TRUE(IsSpokenFeedbackEnabled());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, TypePref) {
   // Logs in.
-  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
-                                                 kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(
+      kTestUserName, kTestUserName, true);
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that the features are disabled just after login.
   EXPECT_FALSE(IsLargeCursorEnabled());
   EXPECT_FALSE(IsSpokenFeedbackEnabled());
   EXPECT_FALSE(IsHighContrastEnabled());
   EXPECT_FALSE(IsAutoclickEnabled());
   EXPECT_EQ(default_autoclick_delay(), GetAutoclickDelay());
   EXPECT_FALSE(IsVirtualKeyboardEnabled());
 
@@ skipping 38 matching lines @@
 
   SetAutoclickEnabledPref(false);
   EXPECT_FALSE(IsAutoclickEnabled());
 
   SetVirtualKeyboardEnabledPref(false);
   EXPECT_FALSE(IsVirtualKeyboardEnabled());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, ResumeSavedPref) {
   // Loads the profile of the user.
-  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
-                                                 kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(
+      kTestUserName, kTestUserName, true);
 
   // Sets the pref to enable large cursor before login.
   SetLargeCursorEnabledPref(true);
   EXPECT_FALSE(IsLargeCursorEnabled());
 
   // Sets the pref to enable spoken feedback before login.
   SetSpokenFeedbackEnabledPref(true);
   EXPECT_FALSE(IsSpokenFeedbackEnabled());
 
   // Sets the pref to enable high contrast before login.
@@ skipping 23 matching lines @@
   EXPECT_TRUE(IsAutoclickEnabled());
   EXPECT_EQ(kTestAutoclickDelayMs, GetAutoclickDelay());
   EXPECT_TRUE(IsVirtualKeyboardEnabled());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest,
                        ChangingTypeInvokesNotification) {
   MockAccessibilityObserver observer;
 
   // Logs in.
-  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
-                                                 kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(
+      kTestUserName, kTestUserName, true);
   user_manager::UserManager::Get()->SessionStarted();
 
   EXPECT_FALSE(observer.observed());
   observer.reset();
 
   SetSpokenFeedbackEnabled(true);
   EXPECT_TRUE(observer.observed());
   EXPECT_TRUE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
             ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
@@ skipping 38 matching lines @@
   EXPECT_EQ(observer.observed_type(),
             ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD);
   EXPECT_FALSE(IsVirtualKeyboardEnabled());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest,
                        ChangingTypePrefInvokesNotification) {
   MockAccessibilityObserver observer;
 
   // Logs in.
-  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
-                                                 kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(
+      kTestUserName, kTestUserName, true);
   user_manager::UserManager::Get()->SessionStarted();
 
   EXPECT_FALSE(observer.observed());
   observer.reset();
 
   SetSpokenFeedbackEnabledPref(true);
   EXPECT_TRUE(observer.observed());
   EXPECT_TRUE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
             ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
@@ skipping 70 matching lines @@
   SetHighContrastEnabled(true);
   EXPECT_TRUE(IsHighContrastEnabled());
   // Enables autoclick.
   SetAutoclickEnabled(true);
   EXPECT_TRUE(IsAutoclickEnabled());
   // Set autoclick delay.
   SetAutoclickDelay(kTestAutoclickDelayMs);
   EXPECT_EQ(kTestAutoclickDelayMs, GetAutoclickDelay());
 
   // Logs in.
-  const AccountId account_id = AccountId::FromUserEmail(GetParam());
-  user_manager::UserManager::Get()->UserLoggedIn(
-      account_id, account_id.GetUserEmail(), true);
+  const char* user_name = GetParam();
+  user_manager::UserManager::Get()->UserLoggedIn(user_name, user_name, true);
 
   // Confirms that the features are still enabled just after login.
   EXPECT_TRUE(IsLargeCursorEnabled());
   EXPECT_TRUE(IsSpokenFeedbackEnabled());
   EXPECT_TRUE(IsHighContrastEnabled());
   EXPECT_TRUE(IsAutoclickEnabled());
   EXPECT_EQ(kTestAutoclickDelayMs, GetAutoclickDelay());
 
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that the features keep enabled after session starts.
   EXPECT_TRUE(IsLargeCursorEnabled());
   EXPECT_TRUE(IsSpokenFeedbackEnabled());
   EXPECT_TRUE(IsHighContrastEnabled());
   EXPECT_TRUE(IsAutoclickEnabled());
   EXPECT_EQ(kTestAutoclickDelayMs, GetAutoclickDelay());
 
   // Confirms that the prefs have been copied to the user's profile.
   EXPECT_TRUE(GetLargeCursorEnabledFromPref());
   EXPECT_TRUE(GetSpokenFeedbackEnabledFromPref());
   EXPECT_TRUE(GetHighContrastEnabledFromPref());
   EXPECT_TRUE(GetAutoclickEnabledFromPref());
   EXPECT_EQ(kTestAutoclickDelayMs, GetAutoclickDelayFromPref());
 }
 
 IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, BrailleWhenLoggedIn) {
   // Logs in.
-  const AccountId account_id = AccountId::FromUserEmail(GetParam());
-  user_manager::UserManager::Get()->UserLoggedIn(
-      account_id, account_id.GetUserEmail(), true);
+  const char* user_name = GetParam();
+  user_manager::UserManager::Get()->UserLoggedIn(user_name, user_name, true);
   user_manager::UserManager::Get()->SessionStarted();
   // This object watches for IME preference changes and reflects those in
   // the IME framework state.
   chromeos::Preferences prefs;
   prefs.InitUserPrefsForTesting(
       PrefServiceSyncableFromProfile(GetProfile()),
       user_manager::UserManager::Get()->GetActiveUser(),
       UserSessionManager::GetInstance()->GetDefaultIMEState(GetProfile()));
 
   // Make sure we start in the expected state.
@@ skipping 24 matching lines @@
 
   // Plugging in a display while spoken feedback is enabled should activate
   // the Braille IME.
   SetBrailleDisplayAvailability(true);
   EXPECT_TRUE(IsSpokenFeedbackEnabled());
   EXPECT_TRUE(IsBrailleImeActive());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, AccessibilityMenuVisibility) {
   // Log in.
-  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
-                                                 kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(
+      kTestUserName, kTestUserName, true);
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that the features are disabled.
   EXPECT_FALSE(IsLargeCursorEnabled());
   EXPECT_FALSE(IsSpokenFeedbackEnabled());
   EXPECT_FALSE(IsHighContrastEnabled());
   EXPECT_FALSE(IsAutoclickEnabled());
   EXPECT_FALSE(ShouldShowAccessibilityMenu());
   EXPECT_FALSE(IsVirtualKeyboardEnabled());
 
@@ skipping 22 matching lines @@
   EXPECT_FALSE(ShouldShowAccessibilityMenu());
 
   // Check on-screen keyboard.
   SetVirtualKeyboardEnabled(true);
   EXPECT_TRUE(ShouldShowAccessibilityMenu());
   SetVirtualKeyboardEnabled(false);
   EXPECT_FALSE(ShouldShowAccessibilityMenu());
 }
 
 }  // namespace chromeos