Move yet more from WmShell to Shell

ash/mus/shelf_delegate_mus.cc

Index: ash/mus/shelf_delegate_mus.cc
diff --git a/ash/mus/shelf_delegate_mus.cc b/ash/mus/shelf_delegate_mus.cc
index 3f0e6d86ea0cf22d1da64a53a0dbd063152be54e..90dd0f91dc864d5ad9f23d6921b52ca531387a90 100644
--- a/ash/mus/shelf_delegate_mus.cc
+++ b/ash/mus/shelf_delegate_mus.cc
@@ -5,7 +5,7 @@
 #include "ash/mus/shelf_delegate_mus.h"
 
 #include "ash/common/shelf/shelf_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "base/strings/string_util.h"
 
 namespace ash {
@@ -18,8 +18,8 @@ ShelfDelegateMus::~ShelfDelegateMus() {}
 // ShelfDelegate:
 
 ShelfID ShelfDelegateMus::GetShelfIDForAppID(const std::string& app_id) {
-  if (WmShell::Get()->shelf_controller()->app_id_to_shelf_id().count(app_id))
-    return WmShell::Get()->shelf_controller()->app_id_to_shelf_id().at(app_id);
+  if (Shell::Get()->shelf_controller()->app_id_to_shelf_id().count(app_id))
+    return Shell::Get()->shelf_controller()->app_id_to_shelf_id().at(app_id);
   return 0;
 }
 
@@ -30,12 +30,12 @@ ShelfID ShelfDelegateMus::GetShelfIDForAppIDAndLaunchID(
 }
 
 bool ShelfDelegateMus::HasShelfIDToAppIDMapping(ShelfID id) const {
-  return WmShell::Get()->shelf_controller()->shelf_id_to_app_id().count(id) > 0;
+  return Shell::Get()->shelf_controller()->shelf_id_to_app_id().count(id) > 0;
 }
 
 const std::string& ShelfDelegateMus::GetAppIDForShelfID(ShelfID id) {
-  if (WmShell::Get()->shelf_controller()->shelf_id_to_app_id().count(id))
-    return WmShell::Get()->shelf_controller()->shelf_id_to_app_id().at(id);
+  if (Shell::Get()->shelf_controller()->shelf_id_to_app_id().count(id))
+    return Shell::Get()->shelf_controller()->shelf_id_to_app_id().at(id);
   return base::EmptyString();
 }