This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc

Index: chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
index 0aeb557bac5aceb330e089a4d9d066ef05ed69f4..36e7713f5de8e06824862094c0a5a05fbd05afda 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
@@ -261,6 +261,9 @@ class AccessibilityManagerTest : public InProcessBrowserTest {
   content::NotificationRegistrar registrar_;
 
   MockBrailleController braille_controller_;
+
+  const AccountId test_account_id_ = AccountId::FromUserEmail(kTestUserName);
+
   DISALLOW_COPY_AND_ASSIGN(AccessibilityManagerTest);
 };
 
@@ -274,8 +277,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, Login) {
   EXPECT_EQ(default_autoclick_delay(), GetAutoclickDelay());
 
   // Logs in.
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Confirms that the features still disabled just after login.
   EXPECT_FALSE(IsLargeCursorEnabled());
@@ -336,8 +339,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, BrailleOnLoginScreen) {
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, TypePref) {
   // Logs in.
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that the features are disabled just after login.
@@ -396,8 +399,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, TypePref) {
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, ResumeSavedPref) {
   // Loads the profile of the user.
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Sets the pref to enable large cursor before login.
   SetLargeCursorEnabledPref(true);
@@ -441,8 +444,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest,
   MockAccessibilityObserver observer;
 
   // Logs in.
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
   user_manager::UserManager::Get()->SessionStarted();
 
   EXPECT_FALSE(observer.observed());
@@ -501,8 +504,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest,
   MockAccessibilityObserver observer;
 
   // Logs in.
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
   user_manager::UserManager::Get()->SessionStarted();
 
   EXPECT_FALSE(observer.observed());
@@ -593,8 +596,9 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest,
   EXPECT_EQ(kTestAutoclickDelayMs, GetAutoclickDelay());
 
   // Logs in.
-  const char* user_name = GetParam();
-  user_manager::UserManager::Get()->UserLoggedIn(user_name, user_name, true);
+  const AccountId account_id = AccountId::FromUserEmail(GetParam());
+  user_manager::UserManager::Get()->UserLoggedIn(
+      account_id, account_id.GetUserEmail(), true);
 
   // Confirms that the features are still enabled just after login.
   EXPECT_TRUE(IsLargeCursorEnabled());
@@ -622,8 +626,9 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest,
 
 IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, BrailleWhenLoggedIn) {
   // Logs in.
-  const char* user_name = GetParam();
-  user_manager::UserManager::Get()->UserLoggedIn(user_name, user_name, true);
+  const AccountId account_id = AccountId::FromUserEmail(GetParam());
+  user_manager::UserManager::Get()->UserLoggedIn(
+      account_id, account_id.GetUserEmail(), true);
   user_manager::UserManager::Get()->SessionStarted();
   // This object watches for IME preference changes and reflects those in
   // the IME framework state.
@@ -668,8 +673,8 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, BrailleWhenLoggedIn) {
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, AccessibilityMenuVisibility) {
   // Log in.
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that the features are disabled.