Move more from WmShell to Shell

ash/common/system/status_area_widget_delegate.cc

Index: ash/common/system/status_area_widget_delegate.cc
diff --git a/ash/common/system/status_area_widget_delegate.cc b/ash/common/system/status_area_widget_delegate.cc
index 57354918d3b3b6382d77b177a280ca5125f1450d..010e201de01b095c270d741fe5358076f62a08a5 100644
--- a/ash/common/system/status_area_widget_delegate.cc
+++ b/ash/common/system/status_area_widget_delegate.cc
@@ -9,9 +9,9 @@
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
@@ -90,7 +90,7 @@ bool StatusAreaWidgetDelegate::CanActivate() const {
   // activation when the user is using the keyboard (FocusCycler).
   const FocusCycler* focus_cycler = focus_cycler_for_testing_
                                         ? focus_cycler_for_testing_
-                                        : WmShell::Get()->focus_cycler();
+                                        : Shell::Get()->focus_cycler();
   return focus_cycler->widget_activating() == GetWidget();
 }