mash: Migrate ShellDelegate ownership and access to WmShell.

ash/wm/lock_layout_manager.cc

Index: ash/wm/lock_layout_manager.cc
diff --git a/ash/wm/lock_layout_manager.cc b/ash/wm/lock_layout_manager.cc
index 8691654c71f8b033ea798e4e09d8ceafbbad9af6..e8d7da91c3b65fc3a4a99b9d770aea1303cdc0d5 100644
--- a/ash/wm/lock_layout_manager.cc
+++ b/ash/wm/lock_layout_manager.cc
@@ -4,10 +4,10 @@
 
 #include "ash/wm/lock_layout_manager.h"
 
+#include "ash/common/shell_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "ash/wm/lock_window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/window.h"
@@ -23,7 +23,7 @@ LockLayoutManager::LockLayoutManager(aura::Window* window)
       window_(window),
       root_window_(window->GetRootWindow()),
       is_observing_keyboard_(false) {
-  Shell::GetInstance()->delegate()->AddVirtualKeyboardStateObserver(this);
+  WmShell::Get()->delegate()->AddVirtualKeyboardStateObserver(this);
   root_window_->AddObserver(this);
   if (keyboard::KeyboardController::GetInstance()) {
     keyboard::KeyboardController::GetInstance()->AddObserver(this);
@@ -40,7 +40,7 @@ LockLayoutManager::~LockLayoutManager() {
     (*it)->RemoveObserver(this);
   }
 
-  Shell::GetInstance()->delegate()->RemoveVirtualKeyboardStateObserver(this);
+  WmShell::Get()->delegate()->RemoveVirtualKeyboardStateObserver(this);
 
   if (keyboard::KeyboardController::GetInstance() && is_observing_keyboard_) {
     keyboard::KeyboardController::GetInstance()->RemoveObserver(this);