Add ShellDelegate, MediaDelegate and KeyboardUI stubs to mus ash

These will be necessary to get the StatusAreaWidget to display in mojo:ash.

* Fork ash::sysui::ShellDelegateMus into //ash/mus
* Convert WmShell constructors to take ShellDelegate via unique_ptr
* Use ash::KeyboardUI for now, rather than KeyboardUIMus
* Move GPUSupport and PointerWatcherDelegate to //ash/common
* Fix some IWYU

No functional changes for regular non-mash chrome.

BUG=619636
TEST=ash_unittests, run chrome --mash manually and no crashes

Review-Url: https://codereview.chromium.org/2150023002
Cr-Commit-Position: refs/heads/master@{#405594}

ash/accelerators/accelerator_controller.cc

@@ -15,6 +15,7 @@
 #include "ash/common/accessibility_types.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/focus_cycler.h"
+#include "ash/common/gpu_support.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/multi_profile_uma.h"
 #include "ash/common/session/session_state_delegate.h"
@@ -38,7 +39,6 @@
 #include "ash/common/wm_shell.h"
 #include "ash/debug.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/gpu_support.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"

ash/ash.gyp

@@ -66,6 +66,9 @@
       'common/display/display_info.h',
       'common/focus_cycler.cc',
       'common/focus_cycler.h',
+      'common/gpu_support.h',
+      'common/gpu_support_stub.cc',
+      'common/gpu_support_stub.h',
       'common/keyboard/keyboard_ui.cc',
       'common/keyboard/keyboard_ui.h',
       'common/keyboard/keyboard_ui_observer.h',
@@ -75,6 +78,7 @@
       'common/metrics/user_metrics_action.h',
       'common/multi_profile_uma.cc',
       'common/multi_profile_uma.h',
+      'common/pointer_watcher_delegate.h',
       'common/popup_message.cc',
       'common/popup_message.h',
       'common/root_window_controller_common.cc',
@@ -519,9 +523,6 @@
       'frame/header_painter.h',
       'frame/header_painter_util.cc',
       'frame/header_painter_util.h',
-      'gpu_support.h',
-      'gpu_support_stub.cc',
-      'gpu_support_stub.h',
       'high_contrast/high_contrast_controller.cc',
       'high_contrast/high_contrast_controller.h',
       'host/ash_window_tree_host.cc',
@@ -559,7 +560,6 @@
       'metrics/task_switch_time_tracker.h',
       'metrics/user_metrics_recorder.cc',
       'metrics/user_metrics_recorder.h',
-      'pointer_watcher_delegate.h',
       'pointer_watcher_delegate_aura.cc',
       'pointer_watcher_delegate_aura.h',
       'root_window_controller.cc',

ash/aura/wm_shell_aura.cc

@@ -4,6 +4,8 @@
 
 #include "ash/aura/wm_shell_aura.h"
 
+#include <utility>
+
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
@@ -38,7 +40,8 @@
 
 namespace ash {
 
-WmShellAura::WmShellAura(ShellDelegate* delegate) : WmShell(delegate) {
+WmShellAura::WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate)
+    : WmShell(std::move(shell_delegate)) {
   WmShell::Set(this);
 }
 

ash/aura/wm_shell_aura.h

@@ -5,6 +5,8 @@
 #ifndef ASH_AURA_WM_SHELL_AURA_H_
 #define ASH_AURA_WM_SHELL_AURA_H_
 
+#include <memory>
+
 #include "ash/ash_export.h"
 #include "ash/aura/wm_lookup_aura.h"
 #include "ash/common/wm_shell.h"
@@ -19,7 +21,7 @@ class ASH_EXPORT WmShellAura : public WmShell,
                                public aura::client::ActivationChangeObserver,
                                public WindowTreeHostManager::Observer {
  public:
-  explicit WmShellAura(ShellDelegate* delegate);
+  explicit WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate);
   ~WmShellAura() override;
 
   static WmShellAura* Get();

ash/gpu_support.h → ash/common/gpu_support.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_GPU_SUPPORT_H_
-#define ASH_GPU_SUPPORT_H_
+#ifndef ASH_COMMON_GPU_SUPPORT_H_
+#define ASH_COMMON_GPU_SUPPORT_H_
 
 #include <list>
 
@@ -32,4 +32,4 @@ class ASH_EXPORT GPUSupport {
 
 }  // namespace ash
 
-#endif  // ASH_GPU_SUPPORT_H_
+#endif  // ASH_COMMON_GPU_SUPPORT_H_

ash/gpu_support_stub.cc → ash/common/gpu_support_stub.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/gpu_support_stub.h"
+#include "ash/common/gpu_support_stub.h"
 
 namespace ash {
 

ash/gpu_support_stub.h → ash/common/gpu_support_stub.h

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_GPU_SUPPORT_STUB_H_
-#define ASH_GPU_SUPPORT_STUB_H_
+#ifndef ASH_COMMON_GPU_SUPPORT_STUB_H_
+#define ASH_COMMON_GPU_SUPPORT_STUB_H_
 
 #include "ash/ash_export.h"
-#include "ash/gpu_support.h"
-#include "base/compiler_specific.h"
+#include "ash/common/gpu_support.h"
 #include "base/macros.h"
 
 namespace ash {
@@ -30,4 +29,4 @@ class ASH_EXPORT GPUSupportStub : public GPUSupport {
 
 }  // namespace ash
 
-#endif  // ASH_GPU_SUPPORT_STUB_H_
+#endif  // ASH_COMMON_GPU_SUPPORT_STUB_H_

ash/pointer_watcher_delegate.h → ash/common/pointer_watcher_delegate.h

@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef ASH_COMMON_POINTER_WATCHER_DELEGATE_H_
+#define ASH_COMMON_POINTER_WATCHER_DELEGATE_H_
+
 #include "ash/ash_export.h"
 
 namespace views {
@@ -20,3 +23,5 @@ class ASH_EXPORT PointerWatcherDelegate {
 };
 
 }  // namespace ash
+
+#endif  // ASH_COMMON_POINTER_WATCHER_DELEGATE_H_

ash/common/wm_shell.cc

@@ -4,6 +4,8 @@
 
 #include "ash/common/wm_shell.h"
 
+#include <utility>
+
 #include "ash/common/focus_cycler.h"
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/shell_delegate.h"
@@ -66,8 +68,8 @@ void WmShell::RemoveShellObserver(ShellObserver* observer) {
   shell_observers_.RemoveObserver(observer);
 }
 
-WmShell::WmShell(ShellDelegate* delegate)
-    : delegate_(delegate),
+WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
+    : delegate_(std::move(shell_delegate)),
       focus_cycler_(new FocusCycler),
       system_tray_notifier_(new SystemTrayNotifier),
       window_selector_controller_(new WindowSelectorController) {

ash/common/wm_shell.h

@@ -218,7 +218,7 @@ class ASH_EXPORT WmShell {
 #endif
 
  protected:
-  explicit WmShell(ShellDelegate* delegate);
+  explicit WmShell(std::unique_ptr<ShellDelegate> shell_delegate);
   virtual ~WmShell();
 
   base::ObserverList<ShellObserver>* shell_observers() {

ash/content/gpu_support_impl.h

@@ -5,8 +5,8 @@
 #ifndef ASH_CONTENT_GPU_SUPPORT_IMPL_H_
 #define ASH_CONTENT_GPU_SUPPORT_IMPL_H_
 
+#include "ash/common/gpu_support.h"
 #include "ash/content/ash_with_content_export.h"
-#include "ash/gpu_support.h"
 #include "base/macros.h"
 
 namespace ash {

ash/mus/BUILD.gn

@@ -65,6 +65,8 @@ source_set("lib") {
     "shelf_layout_manager.cc",
     "shelf_layout_manager.h",
     "shelf_layout_manager_delegate.h",
+    "shell_delegate_mus.cc",
+    "shell_delegate_mus.h",
     "status_layout_manager.cc",
     "status_layout_manager.h",
     "user_window_controller_impl.cc",
@@ -78,6 +80,7 @@ source_set("lib") {
 
   deps = [
     "//components/user_manager",
+    "//ui/app_list/presenter",
   ]
 
   public_deps = [

ash/mus/bridge/wm_shell_mus.cc

@@ -4,9 +4,13 @@
 
 #include "ash/mus/bridge/wm_shell_mus.h"
 
+#include <utility>
+
 #include "ash/common/default_accessibility_delegate.h"
 #include "ash/common/display/display_info.h"
+#include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/default_system_tray_delegate.h"
@@ -119,10 +123,10 @@ class AccessibilityDelegateMus : public DefaultAccessibilityDelegate {
 
 }  // namespace
 
-WmShellMus::WmShellMus(ShellDelegate* delegate,
+WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
                        ::ui::WindowTreeClient* client,
                        shell::Connector* connector)
-    : WmShell(delegate),
+    : WmShell(std::move(shell_delegate)),
       client_(client),
       connector_(connector),
       session_state_delegate_(new SessionStateDelegateStub) {
@@ -134,7 +138,11 @@ WmShellMus::WmShellMus(ShellDelegate* delegate,
   CreateMruWindowTracker();
 
   accessibility_delegate_.reset(new AccessibilityDelegateMus(connector_));
+  SetMediaDelegate(base::WrapUnique(delegate()->CreateMediaDelegate()));
   SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
+
+  // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here.
+  SetKeyboardUI(KeyboardUI::Create());
 }
 
 WmShellMus::~WmShellMus() {

ash/mus/bridge/wm_shell_mus.h

@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 
+#include <memory>
 #include <vector>
 
 #include "ash/common/wm_shell.h"
@@ -31,7 +32,7 @@ class WmWindowMus;
 // WmShell implementation for mus.
 class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
  public:
-  WmShellMus(ShellDelegate* delegate,
+  WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
              ::ui::WindowTreeClient* client,
              shell::Connector* connector);
   ~WmShellMus() override;

ash/mus/root_window_controller.cc

@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 
+#include <algorithm>
 #include <map>
 #include <sstream>
 

ash/mus/shell_delegate_mus.cc

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/mus/shell_delegate_mus.h"
+
+#include <utility>
+
+#include "ash/common/default_accessibility_delegate.h"
+#include "ash/common/gpu_support_stub.h"
+#include "ash/common/media_delegate.h"
+#include "ash/common/pointer_watcher_delegate.h"
+#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/system/tray/default_system_tray_delegate.h"
+#include "base/memory/ptr_util.h"
+#include "base/strings/string16.h"
+#include "components/user_manager/user_info_impl.h"
+#include "ui/app_list/presenter/app_list_presenter.h"
+#include "ui/gfx/image/image.h"
+
+namespace ash {
+namespace {
+
+class SessionStateDelegateStub : public SessionStateDelegate {
+ public:
+  SessionStateDelegateStub()
+      : screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {}
+
+  ~SessionStateDelegateStub() override {}
+
+  // SessionStateDelegate:
+  int GetMaximumNumberOfLoggedInUsers() const override { return 3; }
+  int NumberOfLoggedInUsers() const override {
+    // ash_shell has 2 users.
+    return 2;
+  }
+  bool IsActiveUserSessionStarted() const override { return true; }
+  bool CanLockScreen() const override { return true; }
+  bool IsScreenLocked() const override { return screen_locked_; }
+  bool ShouldLockScreenBeforeSuspending() const override { return false; }
+  void LockScreen() override {
+    screen_locked_ = true;
+    NOTIMPLEMENTED();
+  }
+  void UnlockScreen() override {
+    NOTIMPLEMENTED();
+    screen_locked_ = false;
+  }
+  bool IsUserSessionBlocked() const override { return false; }
+  SessionState GetSessionState() const override { return SESSION_STATE_ACTIVE; }
+  const user_manager::UserInfo* GetUserInfo(UserIndex index) const override {
+    return user_info_.get();
+  }
+  bool ShouldShowAvatar(WmWindow* window) const override {
+    NOTIMPLEMENTED();
+    return !user_info_->GetImage().isNull();
+  }
+  gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override {
+    NOTIMPLEMENTED();
+    return gfx::ImageSkia();
+  }
+  void SwitchActiveUser(const AccountId& account_id) override {}
+  void CycleActiveUser(CycleUser cycle_user) override {}
+  bool IsMultiProfileAllowedByPrimaryUserPolicy() const override {
+    return true;
+  }
+  void AddSessionStateObserver(ash::SessionStateObserver* observer) override {}
+  void RemoveSessionStateObserver(
+      ash::SessionStateObserver* observer) override {}
+
+ private:
+  bool screen_locked_;
+
+  // A pseudo user info.
+  std::unique_ptr<user_manager::UserInfo> user_info_;
+
+  DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
+};
+
+class MediaDelegateStub : public MediaDelegate {
+ public:
+  MediaDelegateStub() {}
+  ~MediaDelegateStub() override {}
+
+  // MediaDelegate:
+  void HandleMediaNextTrack() override { NOTIMPLEMENTED(); }
+  void HandleMediaPlayPause() override { NOTIMPLEMENTED(); }
+  void HandleMediaPrevTrack() override { NOTIMPLEMENTED(); }
+  MediaCaptureState GetMediaCaptureState(UserIndex index) override {
+    NOTIMPLEMENTED();
+    return MEDIA_CAPTURE_NONE;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
+};
+
+}  // namespace
+
+ShellDelegateMus::ShellDelegateMus(
+    std::unique_ptr<app_list::AppListPresenter> app_list_presenter)
+    : app_list_presenter_(std::move(app_list_presenter)) {}
+
+ShellDelegateMus::~ShellDelegateMus() {}
+
+bool ShellDelegateMus::IsFirstRunAfterBoot() const {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool ShellDelegateMus::IsIncognitoAllowed() const {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool ShellDelegateMus::IsMultiProfilesEnabled() const {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool ShellDelegateMus::IsRunningInForcedAppMode() const {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool ShellDelegateMus::CanShowWindowForUser(WmWindow* window) const {
+  NOTIMPLEMENTED();
+  return true;
+}
+
+bool ShellDelegateMus::IsForceMaximizeOnFirstRun() const {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+void ShellDelegateMus::PreInit() {
+  NOTIMPLEMENTED();
+}
+
+void ShellDelegateMus::PreShutdown() {
+  NOTIMPLEMENTED();
+}
+
+void ShellDelegateMus::Exit() {
+  NOTIMPLEMENTED();
+}
+
+keyboard::KeyboardUI* ShellDelegateMus::CreateKeyboardUI() {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+void ShellDelegateMus::OpenUrl(const GURL& url) {
+  NOTIMPLEMENTED();
+}
+
+app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
+  return app_list_presenter_.get();
+}
+
+ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
+  NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation";
+  return new DefaultSystemTrayDelegate;
+}
+
+UserWallpaperDelegate* ShellDelegateMus::CreateUserWallpaperDelegate() {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
+  NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
+  return new SessionStateDelegateStub;
+}
+
+AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
+  NOTIMPLEMENTED() << " Using the default AccessibilityDelegate implementation";
+  return new DefaultAccessibilityDelegate;
+}
+
+NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
+  NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
+  return new MediaDelegateStub;
+}
+
+std::unique_ptr<PointerWatcherDelegate>
+ShellDelegateMus::CreatePointerWatcherDelegate() {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf,
+                                                   const ShelfItem* item) {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+GPUSupport* ShellDelegateMus::CreateGPUSupport() {
+  NOTIMPLEMENTED() << " Using a stub GPUSupport implementation";
+  return new GPUSupportStub();
+}
+
+base::string16 ShellDelegateMus::GetProductName() const {
+  NOTIMPLEMENTED();
+  return base::string16();
+}
+
+gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
+  NOTIMPLEMENTED();
+  return gfx::Image();
+}
+
+}  // namespace ash

ash/mus/shell_delegate_mus.h

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_
+#define ASH_MUS_SHELL_DELEGATE_MUS_H_
+
+#include <memory>
+
+#include "ash/common/shell_delegate.h"
+#include "base/macros.h"
+
+namespace app_list {
+class AppListPresenter;
+}
+
+namespace ash {
+
+class ShellDelegateMus : public ShellDelegate {
+ public:
+  explicit ShellDelegateMus(
+      std::unique_ptr<app_list::AppListPresenter> app_list_presenter);
+  ~ShellDelegateMus() override;
+
+  bool IsFirstRunAfterBoot() const override;
+  bool IsIncognitoAllowed() const override;
+  bool IsMultiProfilesEnabled() const override;
+  bool IsRunningInForcedAppMode() const override;
+  bool CanShowWindowForUser(WmWindow* window) const override;
+  bool IsForceMaximizeOnFirstRun() const override;
+  void PreInit() override;
+  void PreShutdown() override;
+  void Exit() override;
+  keyboard::KeyboardUI* CreateKeyboardUI() override;
+  void OpenUrl(const GURL& url) override;
+  app_list::AppListPresenter* GetAppListPresenter() override;
+  ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
+  SystemTrayDelegate* CreateSystemTrayDelegate() override;
+  UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
+  SessionStateDelegate* CreateSessionStateDelegate() override;
+  AccessibilityDelegate* CreateAccessibilityDelegate() override;
+  NewWindowDelegate* CreateNewWindowDelegate() override;
+  MediaDelegate* CreateMediaDelegate() override;
+  std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
+      override;
+  ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
+                                   const ShelfItem* item) override;
+  GPUSupport* CreateGPUSupport() override;
+  base::string16 GetProductName() const override;
+  gfx::Image GetDeprecatedAcceleratorImage() const override;
+
+ private:
+  std::unique_ptr<app_list::AppListPresenter> app_list_presenter_;
+
+  DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
+};
+
+}  // namespace ash
+
+#endif  // ASH_MUS_SHELL_DELEGATE_MUS_H_

ash/mus/window_manager.cc

@@ -17,6 +17,7 @@
 #include "ash/mus/property_util.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/shadow_controller.h"
+#include "ash/mus/shell_delegate_mus.h"
 #include "ash/mus/window_manager_observer.h"
 #include "ash/public/interfaces/container.mojom.h"
 #include "services/ui/common/event_matcher_util.h"
@@ -27,6 +28,7 @@
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/interfaces/mus_constants.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
+#include "ui/app_list/presenter/app_list_presenter.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/mojo/event.mojom.h"
 #include "ui/views/mus/screen_mus.h"
@@ -40,6 +42,29 @@ void AssertTrue(bool success) {
   DCHECK(success);
 }
 
+// TODO(jamescook): Port ash::sysui::AppListPresenterMus and eliminate this.
+class AppListPresenterStub : public app_list::AppListPresenter {
+ public:
+  AppListPresenterStub() {}
+  ~AppListPresenterStub() override {}
+
+  // app_list::AppListPresenter:
+  void Show(int64_t display_id) override { NOTIMPLEMENTED(); }
+  void Dismiss() override { NOTIMPLEMENTED(); }
+  void ToggleAppList(int64_t display_id) override { NOTIMPLEMENTED(); }
+  bool IsVisible() const override {
+    NOTIMPLEMENTED();
+    return false;
+  }
+  bool GetTargetVisibility() const override {
+    NOTIMPLEMENTED();
+    return false;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AppListPresenterStub);
+};
+
 WindowManager::WindowManager(shell::Connector* connector)
     : connector_(connector) {}
 
@@ -70,8 +95,10 @@ void WindowManager::Init(::ui::WindowTreeClient* window_tree_client) {
   window_manager_client_->SetFrameDecorationValues(
       std::move(frame_decoration_values));
 
-  // TODO(msw): Provide a valid ShellDelegate here; maybe port ShellDelegateMus?
-  shell_.reset(new WmShellMus(nullptr, window_tree_client_, connector_));
+  std::unique_ptr<ShellDelegate> shell_delegate(
+      new ShellDelegateMus(base::MakeUnique<AppListPresenterStub>()));
+  shell_.reset(new WmShellMus(std::move(shell_delegate), window_tree_client_,
+                              connector_));
   lookup_.reset(new WmLookupMus);
 }
 

ash/pointer_watcher_delegate_aura.h

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "ash/ash_export.h"
-#include "ash/pointer_watcher_delegate.h"
+#include "ash/common/pointer_watcher_delegate.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/events/event_handler.h"

ash/shell.cc

@@ -16,8 +16,10 @@
 #include "ash/autoclick/autoclick_controller.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/ash_switches.h"
+#include "ash/common/gpu_support.h"
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/login_status.h"
+#include "ash/common/pointer_watcher_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate_manager.h"
@@ -47,7 +49,6 @@
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/first_run/first_run_helper_impl.h"
 #include "ash/frame/custom_frame_view_ash.h"
-#include "ash/gpu_support.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/ime/input_method_event_handler.h"
@@ -55,7 +56,6 @@
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/new_window_delegate.h"
-#include "ash/pointer_watcher_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/app_list_shelf_item_delegate.h"
 #include "ash/shelf/shelf.h"
@@ -600,7 +600,7 @@ void Shell::DoInitialWorkspaceAnimation() {
 // Shell, private:
 
 Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool)
-    : wm_shell_(new WmShellAura(delegate)),
+    : wm_shell_(new WmShellAura(base::WrapUnique(delegate))),
       target_root_window_(nullptr),
       scoped_target_root_window_(nullptr),
       shelf_model_(new ShelfModel),

ash/shell/shell_delegate_impl.cc

@@ -7,13 +7,13 @@
 #include "ash/app_list/app_list_presenter_delegate_factory.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/default_accessibility_delegate.h"
+#include "ash/common/gpu_support_stub.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/default_system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/default_user_wallpaper_delegate.h"
-#include "ash/gpu_support_stub.h"
 #include "ash/new_window_delegate.h"
 #include "ash/pointer_watcher_delegate_aura.h"
 #include "ash/shell.h"

ash/sysui/pointer_watcher_delegate_mus.h

@@ -5,7 +5,7 @@
 #ifndef ASH_SYSUI_POINTER_WATCHER_DELEGATE_MUS_H_
 #define ASH_SYSUI_POINTER_WATCHER_DELEGATE_MUS_H_
 
-#include "ash/pointer_watcher_delegate.h"
+#include "ash/common/pointer_watcher_delegate.h"
 #include "base/macros.h"
 
 namespace ash {

ash/sysui/shell_delegate_mus.cc

@@ -5,10 +5,10 @@
 #include "ash/sysui/shell_delegate_mus.h"
 
 #include "ash/common/default_accessibility_delegate.h"
+#include "ash/common/gpu_support_stub.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/default_system_tray_delegate.h"
-#include "ash/gpu_support_stub.h"
 #include "ash/sysui/app_list_presenter_mus.h"
 #include "ash/sysui/context_menu_mus.h"
 #include "ash/sysui/pointer_watcher_delegate_mus.h"

ash/test/test_shell_delegate.cc

@@ -9,12 +9,12 @@
 #include "ash/app_list/app_list_presenter_delegate.h"
 #include "ash/app_list/app_list_presenter_delegate_factory.h"
 #include "ash/common/default_accessibility_delegate.h"
+#include "ash/common/gpu_support_stub.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
-#include "ash/gpu_support_stub.h"
 #include "ash/new_window_delegate.h"
 #include "ash/pointer_watcher_delegate_aura.h"
 #include "ash/test/test_keyboard_ui.h"