mash: Move ownership of ShelfDelegate to WmShell

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index ec0b0941dc926b8a8b0381185bf70e0ff94f24de..1cdc2c5b913deccffd8585d6848ab07de66eda46 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -33,6 +33,7 @@ class MaximizeModeController;
 class MruWindowTracker;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionStateDelegate;
+class ShelfDelegate;
 class ShelfModel;
 class ShellDelegate;
 class ShellObserver;
@@ -100,6 +101,8 @@ class ASH_EXPORT WmShell {
 
   MediaDelegate* media_delegate() { return media_delegate_.get(); }
 
+  ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
+
   ShelfModel* shelf_model() { return shelf_model_.get(); }
 
   SystemTrayNotifier* system_tray_notifier() {
@@ -258,6 +261,8 @@ class ASH_EXPORT WmShell {
   void AddLockStateObserver(LockStateObserver* observer);
   void RemoveLockStateObserver(LockStateObserver* observer);
 
+  void SetShelfDelegateForTesting(std::unique_ptr<ShelfDelegate> test_delegate);
+
 #if defined(OS_CHROMEOS)
   LogoutConfirmationController* logout_confirmation_controller() {
     return logout_confirmation_controller_.get();
@@ -282,6 +287,8 @@ class ASH_EXPORT WmShell {
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
   void DeleteSystemTrayDelegate();
 
+  void CreateShelfDelegate();
+
   void DeleteWindowCycleController();
 
   void DeleteWindowSelectorController();
@@ -316,6 +323,7 @@ class ASH_EXPORT WmShell {
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaDelegate> media_delegate_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
+  std::unique_ptr<ShelfDelegate> shelf_delegate_;
   std::unique_ptr<ShelfModel> shelf_model_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;