mash: Migrate ShellDelegate ownership and access to WmShell.

ash/wm/window_positioner_unittest.cc

Index: ash/wm/window_positioner_unittest.cc
diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc
index 839607cfc8e140792e0be7b5d5d86ede3669521d..325022411b10e08ff6667ecd75cd020ca1d1d842 100644
--- a/ash/wm/window_positioner_unittest.cc
+++ b/ash/wm/window_positioner_unittest.cc
@@ -9,6 +9,7 @@
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/test/ash_md_test_base.h"
@@ -174,7 +175,7 @@ TEST_P(WindowPositionerTest, FirstRunMaximizeWindowHighResloution) {
   ui::WindowShowState show_state_out = ui::SHOW_STATE_DEFAULT;
 
   test::TestShellDelegate* const delegate =
-      static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
+      static_cast<test::TestShellDelegate*>(WmShell::Get()->delegate());
   delegate->SetForceMaximizeOnFirstRun(true);
 
   WindowPositioner::GetBoundsAndShowStateForNewWindow(
@@ -193,7 +194,7 @@ TEST_P(WindowPositionerTest, FirstRunMaximizeWindowLowResolution) {
   ui::WindowShowState show_state_out = ui::SHOW_STATE_DEFAULT;
 
   test::TestShellDelegate* const delegate =
-      static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
+      static_cast<test::TestShellDelegate*>(WmShell::Get()->delegate());
   delegate->SetForceMaximizeOnFirstRun(true);
 
   WindowPositioner::GetBoundsAndShowStateForNewWindow(