chrome/browser/chromeos/system/tray_accessibility_browsertest.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

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 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Fix Win GN build. Created 5 years, 1 month 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/device_disabling_manager_unittest.cc ('k') | chrome/browser/download/notification/download_notification_browsertest.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 2badedad77f2c8ed5044f5762675b0fe4c80d8a5..b6e2b8a32b469661aecf52d6820a49ebeef93fb5 100644

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

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

@@ -272,7 +272,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, LoginStatus) {

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

user_manager::UserManager::Get()->UserLoggedIn(

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

+ AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",

+ true);

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

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

@@ -285,7 +286,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {

EXPECT_FALSE(IsTrayIconVisible());

user_manager::UserManager::Get()->UserLoggedIn(

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

+ AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",

+ true);

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

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

@@ -350,7 +352,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {

IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {

// Login

user_manager::UserManager::Get()->UserLoggedIn(

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

+ AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",

+ true);

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

SetShowAccessibilityOptionsInSystemTrayMenu(false);

@@ -418,7 +421,8 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenu) {

IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {

// Login

user_manager::UserManager::Get()->UserLoggedIn(

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

+ AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",

+ true);

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

SetShowAccessibilityOptionsInSystemTrayMenu(true);