Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

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

Issue 2821363002: cros: Disable system tray help/lock buttons during supervised user creation (Closed)
Patch Set: fix browser test Created 3 years, 8 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 | « ash/test/test_session_controller_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 547e31eaae24bbba48a4d497ff68786ea6f21788..f884de448e15ca0766e0ae495a54ff2f43d55c52 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -1641,7 +1641,12 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
CloseDetailMenu();
- SetLoginStatus(ash::LoginStatus::USER);
+ // Simulate login.
+ session_manager::SessionManager::Get()->CreateSession(
+ AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain");
+ session_manager::SessionManager::Get()->SessionStarted();
+ // Flush to ensure the session state reaches ash and updates login status.
+ SessionControllerClient::FlushForTesting();
EXPECT_TRUE(CreateDetailedMenu());
EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
@@ -1659,7 +1664,11 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
CloseDetailMenu();
- SetLoginStatus(ash::LoginStatus::LOCKED);
+ // Simulate screen lock.
+ session_manager::SessionManager::Get()->SetSessionState(
+ session_manager::SessionState::LOCKED);
+ // Flush to ensure the session state reaches ash and updates login status.
+ SessionControllerClient::FlushForTesting();
EXPECT_TRUE(CreateDetailedMenu());
EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
@@ -1677,11 +1686,11 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
CloseDetailMenu();
+ // Simulate adding multiprofile user.
session_manager::SessionManager::Get()->SetSessionState(
session_manager::SessionState::LOGIN_SECONDARY);
// Flush to ensure the session state reaches ash and updates login status.
SessionControllerClient::FlushForTesting();
- SetLoginStatus(ash::LoginStatus::USER);
EXPECT_TRUE(CreateDetailedMenu());
EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
« no previous file with comments | « ash/test/test_session_controller_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698