chrome/browser/chromeos/system/tray_accessibility_browsertest.cc - Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/system/automatic_reboot_manager.cc ('k') | chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

index 586e73f90bcba68eabcc6c7e8955d0893049a6b3..3ad1eda0bb2f17971f54366a0115919e8432ef99 100644

--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

@@ -262,9 +262,9 @@ class TrayAccessibilityTest

IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, LoginStatus) {

EXPECT_EQ(ash::user::LOGGED_IN_NONE, GetLoginStatus());

- UserManager::Get()->UserLoggedIn(

+ GetUserManager()->UserLoggedIn(

"owner@invalid.domain", "owner@invalid.domain", true);

- UserManager::Get()->SessionStarted();

+ GetUserManager()->SessionStarted();

EXPECT_EQ(ash::user::LOGGED_IN_USER, GetLoginStatus());

}

@@ -275,9 +275,9 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {

// Confirms that the icon is invisible before login.

EXPECT_FALSE(IsTrayIconVisible());

- UserManager::Get()->UserLoggedIn(

+ GetUserManager()->UserLoggedIn(

"owner@invalid.domain", "owner@invalid.domain", true);

- UserManager::Get()->SessionStarted();

+ GetUserManager()->SessionStarted();

// Confirms that the icon is invisible just after login.

EXPECT_FALSE(IsTrayIconVisible());

@@ -340,9 +340,9 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {

IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {

// Login

- UserManager::Get()->UserLoggedIn(

+ GetUserManager()->UserLoggedIn(

"owner@invalid.domain", "owner@invalid.domain", true);

- UserManager::Get()->SessionStarted();

+ GetUserManager()->SessionStarted();

SetShowAccessibilityOptionsInSystemTrayMenu(false);

@@ -408,9 +408,9 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {

IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {

// Login

- UserManager::Get()->UserLoggedIn(

+ GetUserManager()->UserLoggedIn(

"owner@invalid.domain", "owner@invalid.domain", true);

- UserManager::Get()->SessionStarted();

+ GetUserManager()->SessionStarted();

SetShowAccessibilityOptionsInSystemTrayMenu(true);