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

Unified Diff: ash/test/ash_test_helper.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
« no previous file with comments | « ash/test/ash_test_helper.h ('k') | ash/wm/always_on_top_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index a9c9aad1d993c9172e234ad5f35ed26af944a790..97d8cc9b947eeb9c8dfc83c198e5cd4bf559a569 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -142,11 +142,13 @@ void AshTestHelper::SetUp(bool start_session) {
aura::test::EnvTestHelper().SetInputStateLookup(
std::unique_ptr<aura::InputStateLookup>());
+ session_controller_client_.reset(
+ new TestSessionControllerClient(WmShell::Get()->session_controller()));
+ session_controller_client_->InitializeAndBind();
+
Shell* shell = Shell::GetInstance();
- if (start_session) {
- GetTestSessionStateDelegate()->SetActiveUserSessionStarted(true);
- GetTestSessionStateDelegate()->SetHasActiveUser(true);
- }
+ if (start_session)
+ session_controller_client_->CreatePredefinedUserSessions(1);
if (!is_mash) {
// ScreenLayoutObserver is specific to classic-ash.
« no previous file with comments | « ash/test/ash_test_helper.h ('k') | ash/wm/always_on_top_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698