Shuffles and renames ash/common/wm classes

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 7513a30e07ccc0b26cffc079b272066be2d610d7..f8e684eca9f2b90d092379f30155ab9dfe71f01f 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -162,6 +162,7 @@ class WebNotificationTray;
 class WindowCycleController;
 class WindowPositioner;
 class WindowSelectorController;
+class WmShellAura;
 
 namespace shell {
 class WindowWatcher;
@@ -171,10 +172,6 @@ namespace test {
 class ShellTestApi;
 }
 
-namespace wm {
-class WmGlobalsAura;
-}
-
 // Shell is a singleton object that presents the Shell API and implements the
 // RootWindow's delegate interface.
 //
@@ -661,7 +658,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
 
   std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
       scoped_overview_animation_settings_factory_;
-  std::unique_ptr<wm::WmGlobalsAura> wm_globals_;
+  std::unique_ptr<WmShellAura> wm_shell_;
 
   // When no explicit target display/RootWindow is given, new windows are
   // created on |scoped_target_root_window_| , unless NULL in