Shuffles and renames ash/common/wm classes

components/exo/shell_surface.cc

Index: components/exo/shell_surface.cc
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index 1080b224b5cc78316911b8e27e1266e8e5a4fd12..3ed2529758f1fed2309adfce99032d018ad09a37 100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -4,11 +4,11 @@
 
 #include "components/exo/shell_surface.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/shell.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/window_state_aura.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ -829,7 +829,7 @@ void ShellSurface::AttemptToStartDrag(int component) {
   }
 
   resizer_ = ash::CreateWindowResizer(
-      ash::wm::WmWindowAura::Get(widget_->GetNativeWindow()), drag_location,
+      ash::WmWindowAura::Get(widget_->GetNativeWindow()), drag_location,
       component, aura::client::WINDOW_MOVE_SOURCE_MOUSE);
   if (!resizer_)
     return;