mash: Migrate SessionStateDelegate access to WmShell.

ash/test/ash_test_helper.cc

Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index dcdb2e0fdc0ce76bf96d270dfd46003d23c05c90..acdf42eaa3d9b3af539d0832164ce1a8ad7df672 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -8,6 +8,7 @@
 #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"
@@ -130,7 +131,7 @@ void AshTestHelper::SetUp(bool start_session) {
   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>());
 
@@ -193,9 +194,9 @@ void AshTestHelper::RunAllPendingInMessageLoop() {
 
 // 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() {