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 d29ebd45dddde9af8e3e0c21128f9bbd00e8fc10..f0f0a41e182015b9a1da96db1d9aa6395b001dd7 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
@@ -223,7 +223,9 @@ bool IsBrailleImeCurrent() {
 
 class AccessibilityManagerTest : public InProcessBrowserTest {
  protected:
-  AccessibilityManagerTest() : default_autoclick_delay_(0) {}
+  AccessibilityManagerTest()
+      : default_autoclick_delay_(0),
+        test_account_id_(AccountId::FromUserEmail(kTestUserName)) {}
   ~AccessibilityManagerTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -260,6 +262,9 @@ class AccessibilityManagerTest : public InProcessBrowserTest {
   content::NotificationRegistrar registrar_;
 
   MockBrailleController braille_controller_;
+
+  const AccountId test_account_id_;

[achuithb, 2015/10/23 00:08:49]

AccountId test_account_id_ = AccountId::FromUserEmail(kTestUserName);

[Alexander Alekseev, 2015/10/23 09:11:21]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(AccessibilityManagerTest);
 };
 
@@ -273,8 +278,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());
@@ -335,8 +340,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.
@@ -395,8 +400,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);
@@ -440,8 +445,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());
@@ -500,8 +505,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 +598,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 user_id = AccountId::FromUserEmail(GetParam());

[achuithb, 2015/10/23 00:08:49]

account_id?

[Alexander Alekseev, 2015/10/23 09:11:21]

Done.

+  user_manager::UserManager::Get()->UserLoggedIn(user_id,
+                                                 user_id.GetUserEmail(), true);
 
   // Confirms that the features are still enabled just after login.
   EXPECT_TRUE(IsLargeCursorEnabled());
@@ -622,8 +628,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 user_id = AccountId::FromUserEmail(GetParam());

[achuithb, 2015/10/23 00:08:49]

account_id?

[Alexander Alekseev, 2015/10/23 09:11:21]

Done.

+  user_manager::UserManager::Get()->UserLoggedIn(user_id,
+                                                 user_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 +675,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.