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 8b7696742a9505f9668ecfcc10ff23228d439c69..5d05a0ef2aaa6f9b8f2fb7371491f174949e0f2f 100644 |
--- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc |
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc |
@@ -272,7 +272,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, Login) { |
EXPECT_EQ(default_autoclick_delay(), GetAutoclickDelay()); |
// Logs in. |
- UserManager::Get()->UserLoggedIn(kTestUserName, kTestUserName, true); |
+ GetUserManager()->UserLoggedIn(kTestUserName, kTestUserName, true); |
// Confirms that the features still disabled just after login. |
EXPECT_FALSE(IsLargeCursorEnabled()); |
@@ -282,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, Login) { |
EXPECT_FALSE(IsVirtualKeyboardEnabled()); |
EXPECT_EQ(default_autoclick_delay(), GetAutoclickDelay()); |
- UserManager::Get()->SessionStarted(); |
+ GetUserManager()->SessionStarted(); |
// Confirms that the features are still disabled just after login. |
EXPECT_FALSE(IsLargeCursorEnabled()); |
@@ -333,8 +333,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, BrailleOnLoginScreen) { |
IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, TypePref) { |
// Logs in. |
- UserManager::Get()->UserLoggedIn(kTestUserName, kTestUserName, true); |
- UserManager::Get()->SessionStarted(); |
+ GetUserManager()->UserLoggedIn(kTestUserName, kTestUserName, true); |
+ GetUserManager()->SessionStarted(); |
// Confirms that the features are disabled just after login. |
EXPECT_FALSE(IsLargeCursorEnabled()); |
@@ -392,7 +392,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, TypePref) { |
IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, ResumeSavedPref) { |
// Loads the profile of the user. |
- UserManager::Get()->UserLoggedIn(kTestUserName, kTestUserName, true); |
+ GetUserManager()->UserLoggedIn(kTestUserName, kTestUserName, true); |
// Sets the pref to enable large cursor before login. |
SetLargeCursorEnabledPref(true); |
@@ -420,7 +420,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, ResumeSavedPref) { |
EXPECT_FALSE(IsVirtualKeyboardEnabled()); |
// Logs in. |
- UserManager::Get()->SessionStarted(); |
+ GetUserManager()->SessionStarted(); |
// Confirms that features are enabled by restoring from pref just after login. |
EXPECT_TRUE(IsLargeCursorEnabled()); |
@@ -436,8 +436,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, |
MockAccessibilityObserver observer; |
// Logs in. |
- UserManager::Get()->UserLoggedIn(kTestUserName, kTestUserName, true); |
- UserManager::Get()->SessionStarted(); |
+ GetUserManager()->UserLoggedIn(kTestUserName, kTestUserName, true); |
+ GetUserManager()->SessionStarted(); |
EXPECT_FALSE(observer.observed()); |
observer.reset(); |
@@ -495,8 +495,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, |
MockAccessibilityObserver observer; |
// Logs in. |
- UserManager::Get()->UserLoggedIn(kTestUserName, kTestUserName, true); |
- UserManager::Get()->SessionStarted(); |
+ GetUserManager()->UserLoggedIn(kTestUserName, kTestUserName, true); |
+ GetUserManager()->SessionStarted(); |
EXPECT_FALSE(observer.observed()); |
observer.reset(); |
@@ -588,7 +588,7 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, |
// Logs in. |
const char* user_name = GetParam(); |
- UserManager::Get()->UserLoggedIn(user_name, user_name, true); |
+ GetUserManager()->UserLoggedIn(user_name, user_name, true); |
// Confirms that the features are still enabled just after login. |
EXPECT_TRUE(IsLargeCursorEnabled()); |
@@ -597,7 +597,7 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, |
EXPECT_TRUE(IsAutoclickEnabled()); |
EXPECT_EQ(kTestAutoclickDelayMs, GetAutoclickDelay()); |
- UserManager::Get()->SessionStarted(); |
+ GetUserManager()->SessionStarted(); |
// Confirms that the features keep enabled after session starts. |
EXPECT_TRUE(IsLargeCursorEnabled()); |
@@ -617,8 +617,8 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, |
IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, BrailleWhenLoggedIn) { |
// Logs in. |
const char* user_name = GetParam(); |
- UserManager::Get()->UserLoggedIn(user_name, user_name, true); |
- UserManager::Get()->SessionStarted(); |
+ GetUserManager()->UserLoggedIn(user_name, user_name, true); |
+ GetUserManager()->SessionStarted(); |
// The |ComponentExtensionIMEManager| defers some initialization to the |
// |FILE| thread. We need to wait for that to finish before continuing. |
InputMethodManager* imm = InputMethodManager::Get(); |
@@ -629,7 +629,7 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, BrailleWhenLoggedIn) { |
// the IME framework state. |
chromeos::Preferences prefs; |
prefs.InitUserPrefsForTesting(PrefServiceSyncable::FromProfile(GetProfile()), |
- UserManager::Get()->GetActiveUser()); |
+ GetUserManager()->GetActiveUser()); |
// Make sure we start in the expected state. |
EXPECT_FALSE(IsBrailleImeActive()); |
@@ -666,8 +666,8 @@ IN_PROC_BROWSER_TEST_P(AccessibilityManagerUserTypeTest, BrailleWhenLoggedIn) { |
IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest, AcessibilityMenuVisibility) { |
// Log in. |
- UserManager::Get()->UserLoggedIn(kTestUserName, kTestUserName, true); |
- UserManager::Get()->SessionStarted(); |
+ GetUserManager()->UserLoggedIn(kTestUserName, kTestUserName, true); |
+ GetUserManager()->SessionStarted(); |
// Confirms that the features are disabled. |
EXPECT_FALSE(IsLargeCursorEnabled()); |