mash: Migrate SessionStateDelegate access to WmShell.

ash/test/ash_test_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/display/display_info.h"
 #include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/test/ash_test_views_delegate.h"
 #include "ash/test/content/test_shell_content_state.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/material_design_controller_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
@@ skipping 102 matching lines @@
 
   // ContentTestSuiteBase might have already initialized
   // MaterialDesignController in unit_tests suite.
   ui::test::MaterialDesignControllerTestAPI::Uninitialize();
   ui::MaterialDesignController::Initialize();
   ash::MaterialDesignController::Initialize();
   ShellInitParams init_params;
   init_params.delegate = test_shell_delegate_;
   init_params.context_factory = context_factory;
   init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
-  ash::Shell::CreateInstance(init_params);
+  Shell::CreateInstance(init_params);
   aura::test::EnvTestHelper(aura::Env::GetInstance())
       .SetInputStateLookup(std::unique_ptr<aura::InputStateLookup>());
 
   Shell* shell = Shell::GetInstance();
   if (start_session) {
     GetTestSessionStateDelegate()->SetActiveUserSessionStarted(true);
     GetTestSessionStateDelegate()->SetHasActiveUser(true);
   }
 
   test::DisplayManagerTestApi().DisableChangeDisplayUponHostResize();
@@ skipping 41 matching lines @@
   views_delegate_.reset();
 }
 
 void AshTestHelper::RunAllPendingInMessageLoop() {
   DCHECK(base::MessageLoopForUI::current() == message_loop_);
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 // static
 TestSessionStateDelegate* AshTestHelper::GetTestSessionStateDelegate() {

[James Cook, 2016/06/29 21:12:23]

optional: Move this method to AshTestBase? And rename to just
GetSessionStateDelegate (but still return TestSessionStateDelegate)? This would
put it close to all the other "session" stuff.

[msw, 2016/06/29 21:43:34]

Eh, doesn't quite make sense to move (used in AshTestHelper), and I don't feel
strongly enough to add a call through in AshTestBase.

-  CHECK(Shell::HasInstance());
+  CHECK(WmShell::HasInstance());
   return static_cast<TestSessionStateDelegate*>(
-      Shell::GetInstance()->session_state_delegate());
+      WmShell::Get()->GetSessionStateDelegate());
 }
 
 aura::Window* AshTestHelper::CurrentContext() {
   aura::Window* root_window = Shell::GetTargetRootWindow();
   if (!root_window)
     root_window = Shell::GetPrimaryRootWindow();
   DCHECK(root_window);
   return root_window;
 }
 
@@ skipping 10 matching lines @@
 bool AshTestHelper::SupportsHostWindowResize() {
 #if defined(OS_WIN)
   return false;
 #else
   return true;
 #endif
 }
 
 }  // namespace test
 }  // namespace ash