Move even more from WmShell to Shell

ash/common/wm/window_cycle_controller.cc

Index: ash/common/wm/window_cycle_controller.cc
diff --git a/ash/common/wm/window_cycle_controller.cc b/ash/common/wm/window_cycle_controller.cc
index 1eaa79026114b86c9229d71ec65afdec99b91218..7b6cfe5d5edb6a7ed8c063d5cfda20f6136c7f6c 100644
--- a/ash/common/wm/window_cycle_controller.cc
+++ b/ash/common/wm/window_cycle_controller.cc
@@ -13,6 +13,7 @@
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/shell.h"
 #include "base/metrics/histogram_macros.h"
 
 namespace ash {
@@ -54,7 +55,7 @@ void WindowCycleController::HandleCycleWindow(Direction direction) {
 
 void WindowCycleController::StartCycling() {
   MruWindowTracker::WindowList window_list =
-      WmShell::Get()->mru_window_tracker()->BuildMruWindowList();
+      Shell::Get()->mru_window_tracker()->BuildMruWindowList();
   // Exclude windows:
   // - non user positionable windows, such as extension popups.
   // - windows being dragged
@@ -107,8 +108,8 @@ void WindowCycleController::StopCycling() {
                            window_cycle_list_->current_index() + 1);
   window_cycle_list_.reset();
 
-  WmWindow* active_window_after_window_cycle = GetActiveWindow(
-      WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
+  WmWindow* active_window_after_window_cycle =
+      GetActiveWindow(Shell::Get()->mru_window_tracker()->BuildMruWindowList());
 
   // Remove our key event filter.
   event_filter_.reset();