This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 73 matching lines @@
 }
 
 void SetFullScreenMagnifierScalePref(double scale) {
   prefs()->SetDouble(prefs::kAccessibilityScreenMagnifierScale, scale);
 }
 
 bool GetScreenMagnifierEnabledFromPref() {
   return prefs()->GetBoolean(prefs::kAccessibilityScreenMagnifierEnabled);
 }
 
-// Creates and logs into a profile with account |name|, and makes sure that
-// the profile is regarded as "non new" in the next login. This is used in
+// Creates and logs into a profile with account |account_id|, and makes sure
+// that the profile is regarded as "non new" in the next login. This is used in
 // PRE_XXX cases so that in the main XXX case we can test non new profiles.
-void PrepareNonNewProfile(const std::string& name) {
-  user_manager::UserManager::Get()->UserLoggedIn(name, name, true);
+void PrepareNonNewProfile(const AccountId& account_id) {
+  user_manager::UserManager::Get()->UserLoggedIn(
+      account_id, account_id.GetUserEmail(), true);
   // To prepare a non-new profile for tests, we must ensure the profile
   // directory and the preference files are created, because that's what
   // Profile::IsNewProfile() checks. UserLoggedIn(), however, does not yet
   // create the profile directory until GetActiveUserProfile() is called.
   ProfileManager::GetActiveUserProfile();
 }
 
 }  // namespace
 
 class MockMagnificationObserver {
@@ skipping 32 matching lines @@
   int magnifier_type_;
 
   scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMagnificationObserver);
 };
 
 
 class MagnificationManagerTest : public InProcessBrowserTest {
  protected:
-  MagnificationManagerTest() {}
+  MagnificationManagerTest()
+      : test_account_id_(AccountId::FromUserEmail(kTestUserName)) {}
   ~MagnificationManagerTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kLoginManager);
     command_line->AppendSwitchASCII(switches::kLoginProfile,
                                     TestingProfile::kTestUserProfileDir);
   }
 
   void SetUpOnMainThread() override {
     // Set the login-screen profile.
     MagnificationManager::Get()->SetProfileForTest(
         ProfileManager::GetActiveUserProfile());
   }
 
+  const AccountId test_account_id_;

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

const AccountId test_account_id_ = AccountId::FromUserEmail(kTestUserName);

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

Done.

+
   DISALLOW_COPY_AND_ASSIGN(MagnificationManagerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, PRE_LoginOffToOff) {
   // Create a new profile once, to run the test with non-new profile.
-  PrepareNonNewProfile(kTestUserName);
+  PrepareNonNewProfile(test_account_id_);
 
   // Sets pref to explicitly disable the magnifier.
   SetScreenMagnifierEnabledPref(false);
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginOffToOff) {
   // Confirms that magnifier is disabled on the login screen.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Disables magnifier on login screen.
   SetMagnifierEnabled(false);
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Logs in with existing profile.
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Confirms that magnifier is still disabled just after login.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that magnifier is still disabled just after session starts.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Enables magnifier.
   SetMagnifierEnabled(true);
   // Confirms that magnifier is enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_TRUE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, PRE_LoginFullToOff) {
   // Create a new profile once, to run the test with non-new profile.
-  PrepareNonNewProfile(kTestUserName);
+  PrepareNonNewProfile(test_account_id_);
 
   // Sets pref to explicitly disable the magnifier.
   SetScreenMagnifierEnabledPref(false);
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginFullToOff) {
   // Confirms that magnifier is disabled on the login screen.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Enables magnifier on login screen.
   SetMagnifierEnabled(true);
   SetMagnifierType(ui::MAGNIFIER_FULL);
   SetFullScreenMagnifierScale(2.5);
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
 
   // Logs in (but the session is not started yet).
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Confirms that magnifier is keeping enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
 
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that magnifier is disabled just after session start.
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_FALSE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, PRE_LoginOffToFull) {
   // Create a new profile once, to run the test with non-new profile.
-  PrepareNonNewProfile(kTestUserName);
+  PrepareNonNewProfile(test_account_id_);
 
   // Sets prefs to explicitly enable the magnifier.
   SetScreenMagnifierEnabledPref(true);
   SetScreenMagnifierTypePref(ui::MAGNIFIER_FULL);
   SetFullScreenMagnifierScalePref(2.5);
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginOffToFull) {
   // Disables magnifier on login screen.
   SetMagnifierEnabled(false);
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Logs in (but the session is not started yet).
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that the magnifier is enabled and configured according to the
   // explicitly set prefs just after session start.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
   EXPECT_TRUE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, PRE_LoginFullToFull) {
   // Create a new profile once, to run the test with non-new profile.
-  PrepareNonNewProfile(kTestUserName);
+  PrepareNonNewProfile(test_account_id_);
 
   // Sets prefs to explicitly enable the magnifier.
   SetScreenMagnifierEnabledPref(true);
   SetScreenMagnifierTypePref(ui::MAGNIFIER_FULL);
   SetFullScreenMagnifierScalePref(2.5);
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginFullToFull) {
   // Enables magnifier on login screen.
   SetMagnifierType(ui::MAGNIFIER_FULL);
   SetMagnifierEnabled(true);
   SetFullScreenMagnifierScale(3.0);
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(3.0, GetFullScreenMagnifierScale());
 
   // Logs in (but the session is not started yet).
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Confirms that magnifier is keeping enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
 
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that the magnifier is enabled and configured according to the
   // explicitly set prefs just after session start.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
   EXPECT_TRUE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, PRE_LoginFullToUnset) {
   // Creates a new profile once, to run the test with non-new profile.
-  PrepareNonNewProfile(kTestUserName);
+  PrepareNonNewProfile(test_account_id_);
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginFullToUnset) {
   // Enables full screen magnifier.
   SetMagnifierType(ui::MAGNIFIER_FULL);
   SetMagnifierEnabled(true);
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
 
   // Logs in (but the session is not started yet).
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Confirms that magnifier is keeping enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
 
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that magnifier is disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_FALSE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginAsNewUserOff) {
   // Confirms that magnifier is disabled on the login screen.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Disables magnifier on login screen explicitly.
   SetMagnifierEnabled(false);
 
   // Logs in (but the session is not started yet).
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_FALSE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginAsNewUserFull) {
   // Enables magnifier on login screen.
   SetMagnifierType(ui::MAGNIFIER_FULL);
   SetMagnifierEnabled(true);
   SetFullScreenMagnifierScale(2.5);
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
 
   // Logs in (but the session is not started yet).
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Confirms that magnifier is keeping enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
 
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that magnifier keeps enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
   EXPECT_EQ(2.5, GetFullScreenMagnifierScale());
   EXPECT_TRUE(GetScreenMagnifierEnabledFromPref());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, LoginAsNewUserUnset) {
   // Confirms that magnifier is disabled on the login screen.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Logs in (but the session is not started yet).
-  user_manager::UserManager::Get()->UserLoggedIn(
-      kTestUserName, kTestUserName, true);
+  user_manager::UserManager::Get()->UserLoggedIn(test_account_id_,
+                                                 kTestUserName, true);
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that magnifier is keeping disabled.
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_FALSE(GetScreenMagnifierEnabledFromPref());
 }
@@ skipping 50 matching lines @@
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
 
   SetMagnifierType(ui::MAGNIFIER_FULL);
   EXPECT_FALSE(IsMagnifierEnabled());
   EXPECT_EQ(ui::MAGNIFIER_FULL, GetMagnifierType());
 }
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, 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 magnifier is disabled just after login.
   EXPECT_FALSE(IsMagnifierEnabled());
 
   // Sets the pref as true to enable magnifier.
   SetScreenMagnifierTypePref(ui::MAGNIFIER_FULL);
   SetScreenMagnifierEnabledPref(true);
   // Confirms that magnifier is enabled.
   EXPECT_TRUE(IsMagnifierEnabled());
@@ skipping 70 matching lines @@
   observer.reset();
 
   // Set full screen magnifier again, and confirm the observer is not called.
   SetMagnifierType(ui::MAGNIFIER_FULL);
   EXPECT_FALSE(observer.observed());
   EXPECT_EQ(GetMagnifierType(), ui::MAGNIFIER_FULL);
   observer.reset();
 }
 
 }  // namespace chromeos