mash: Migrate ShellDelegate ownership and access to WmShell.

ash/aura/wm_shell_aura.cc

Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 90a6d84fae0f93ce17e362d0fe62e5407df9e2ed..19871636cb123b25a6d12df475787fc7ca58e342 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -6,6 +6,7 @@
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
@@ -15,7 +16,6 @@
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
-#include "ash/shell_delegate.h"
 #include "ash/wm/drag_window_resizer.h"
 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
 #include "ash/wm/screen_pinning_controller.h"
@@ -38,7 +38,7 @@
 
 namespace ash {
 
-WmShellAura::WmShellAura() {
+WmShellAura::WmShellAura(ShellDelegate* delegate) : WmShell(delegate) {
   WmShell::Set(this);
 }
 
@@ -93,7 +93,7 @@ bool WmShellAura::IsActiveDisplayId(int64_t display_id) const {
 }
 
 bool WmShellAura::IsForceMaximizeOnFirstRun() {
-  return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();
+  return delegate()->IsForceMaximizeOnFirstRun();
 }
 
 bool WmShellAura::IsPinned() {
@@ -106,7 +106,7 @@ void WmShellAura::SetPinnedWindow(WmWindow* window) {
 }
 
 bool WmShellAura::CanShowWindowForUser(WmWindow* window) {
-  return Shell::GetInstance()->delegate()->CanShowWindowForUser(window);
+  return delegate()->CanShowWindowForUser(window);
 }
 
 void WmShellAura::LockCursor() {