mash: Move ownership of ShelfDelegate to WmShell

chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

Index: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
index 07611d07f33361451b72f9180c418a91364c877d..b348d1a27437e8b83f53aedc641fd8e6741518ca 100644
--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
@@ -4,8 +4,9 @@
 
 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
 
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "ash/metrics/task_switch_metrics_recorder.h"
-#include "ash/shelf/shelf_delegate.h"
 #include "ash/shell.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
@@ -39,21 +40,21 @@ gfx::Rect AppListControllerDelegateAsh::GetAppListBounds() {
 }
 
 bool AppListControllerDelegateAsh::IsAppPinned(const std::string& app_id) {
-  return ash::Shell::GetInstance()->GetShelfDelegate()->IsAppPinned(app_id);
+  return ash::WmShell::Get()->shelf_delegate()->IsAppPinned(app_id);
 }
 
 bool AppListControllerDelegateAsh::IsAppOpen(const std::string& app_id) const {
   ash::ShelfID id =
-      ash::Shell::GetInstance()->GetShelfDelegate()->GetShelfIDForAppID(app_id);
+      ash::WmShell::Get()->shelf_delegate()->GetShelfIDForAppID(app_id);
   return id && ChromeLauncherController::instance()->IsOpen(id);
 }
 
 void AppListControllerDelegateAsh::PinApp(const std::string& app_id) {
-  ash::Shell::GetInstance()->GetShelfDelegate()->PinAppWithID(app_id);
+  ash::WmShell::Get()->shelf_delegate()->PinAppWithID(app_id);
 }
 
 void AppListControllerDelegateAsh::UnpinApp(const std::string& app_id) {
-  ash::Shell::GetInstance()->GetShelfDelegate()->UnpinAppWithID(app_id);
+  ash::WmShell::Get()->shelf_delegate()->UnpinAppWithID(app_id);
 }
 
 AppListControllerDelegate::Pinnable AppListControllerDelegateAsh::GetPinnable(