Promotes more accessors from WmShell to Shell

ash/wm/window_cycle_event_filter_aura.cc

Index: ash/wm/window_cycle_event_filter_aura.cc
diff --git a/ash/wm/window_cycle_event_filter_aura.cc b/ash/wm/window_cycle_event_filter_aura.cc
index 77ec193b0dd7fdc3120e677b8fad4e7f1021a85c..d77397a424f89b12d66576585104cc6ec67f5a7c 100644
--- a/ash/wm/window_cycle_event_filter_aura.cc
+++ b/ash/wm/window_cycle_event_filter_aura.cc
@@ -7,7 +7,6 @@
 #include "ash/common/accelerators/debug_commands.h"
 #include "ash/common/wm/window_cycle_controller.h"
 #include "ash/common/wm/window_cycle_list.h"
-#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ui/events/event.h"
 
@@ -43,14 +42,13 @@ void WindowCycleEventFilterAura::OnKeyEvent(ui::KeyEvent* event) {
                !repeat_timer_.IsRunning()) {
       repeat_timer_.Start(
           FROM_HERE, base::TimeDelta::FromMilliseconds(180),
-          base::Bind(
-              &WindowCycleController::HandleCycleWindow,
-              base::Unretained(WmShell::Get()->window_cycle_controller()),
-              event->IsShiftDown() ? WindowCycleController::BACKWARD
-                                   : WindowCycleController::FORWARD));
+          base::Bind(&WindowCycleController::HandleCycleWindow,
+                     base::Unretained(Shell::Get()->window_cycle_controller()),
+                     event->IsShiftDown() ? WindowCycleController::BACKWARD
+                                          : WindowCycleController::FORWARD));
     }
   } else if (event->key_code() == ui::VKEY_ESCAPE) {
-    WmShell::Get()->window_cycle_controller()->CancelCycling();
+    Shell::Get()->window_cycle_controller()->CancelCycling();
   }
 }
 
@@ -73,7 +71,7 @@ void WindowCycleEventFilterAura::AltReleaseHandler::OnKeyEvent(
   // Views uses VKEY_MENU for both left and right Alt keys.
   if (event->key_code() == ui::VKEY_MENU &&
       event->type() == ui::ET_KEY_RELEASED) {
-    WmShell::Get()->window_cycle_controller()->CompleteCycling();
+    Shell::Get()->window_cycle_controller()->CompleteCycling();
     // Warning: |this| will be deleted from here on.
   }
 }