Move more from WmShell to Shell

ash/focus_cycler_unittest.cc

Index: ash/focus_cycler_unittest.cc
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index 1c42b81e39e4ffed78138e69d1c2e0db99c65468..ef71be297060ba7b3f8a10b2ff2e6dced20b5aba 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -11,7 +11,7 @@
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/system/status_area_widget_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/test/test_windows.h"
@@ -391,14 +391,14 @@ TEST_F(FocusCyclerTest, RemoveWidgetOnDisplayRemoved) {
   EXPECT_TRUE(wm::IsActiveWindow(window.get()));
 
   // Cycle focus to the status area.
-  WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
+  Shell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_FALSE(wm::IsActiveWindow(window.get()));
 
   // Cycle focus to the shelf.
-  WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
+  Shell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
 
   // Cycle focus should go back to the browser.
-  WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
+  Shell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window.get()));
 }