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

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

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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
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 9deeea1c55df6e66628b325c22c9590cc0872c3f..34d79069e0d8ffc402cf5e7b9b1753ffd514c787 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -6,7 +6,6 @@
#include "ash/common/login_status.h"
#include "ash/common/system/tray/system_tray.h"
#include "ash/common/system/tray_accessibility.h"
-#include "ash/common/test/test_session_state_delegate.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/shell.h"
#include "ash/test/shell_test_api.h"
@@ -890,11 +889,9 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
EXPECT_FALSE(IsSettingsAvailableOnDetailMenu());
CloseDetailMenu();
- ash::test::TestSessionStateDelegate* session_state_delegate =
- new ash::test::TestSessionStateDelegate;
- ash::test::ShellTestApi test_api(ash::Shell::GetInstance());
- test_api.SetSessionStateDelegate(session_state_delegate);
- session_state_delegate->SetUserAddingScreenRunning(true);
+ session_manager::SessionManager::Get()->SetSessionState(
+ session_manager::SessionState::LOGIN_SECONDARY);
+ base::RunLoop().RunUntilIdle(); // Flush session state to ash.
SetLoginStatus(ash::LoginStatus::USER);
EXPECT_TRUE(CreateDetailedMenu());
EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());

Powered by Google App Engine
This is Rietveld 408576698