mash: Migrate ShellDelegate ownership and access to WmShell.

ash/test/test_shell_delegate.h

Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 704d83d2b23959fe75a97c80db9196040d644985..fb0d555878d399c32f1948680e61c282e3f5c543 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "ash/common/media_delegate.h"
-#include "ash/shell_delegate.h"
+#include "ash/common/shell_delegate.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
@@ -88,7 +88,7 @@ class TestShellDelegate : public ShellDelegate {
       app_list_presenter_delegate_factory_;
   std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
 
-  base::ObserverList<ash::VirtualKeyboardStateObserver>
+  base::ObserverList<VirtualKeyboardStateObserver>
       keyboard_state_observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);