Shuffles and renames ash/common/wm classes

ash/frame/custom_frame_view_ash.cc

Index: ash/frame/custom_frame_view_ash.cc
diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc
index 6a16bdd900d322bc4b562b5e6ab0a6188a851bec..0a1a5644b934db6c07b7d9e6f41cf0c99d83e127 100644
--- a/ash/frame/custom_frame_view_ash.cc
+++ b/ash/frame/custom_frame_view_ash.cc
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "ash/ash_switches.h"
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.h"
 #include "ash/common/wm/window_state_observer.h"
@@ -18,7 +19,6 @@
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_observer.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/immersive_fullscreen_controller.h"
 #include "ash/wm/window_state_aura.h"
 #include "base/command_line.h"
@@ -75,7 +75,7 @@ class CustomFrameViewAshWindowStateDelegate
   }
  private:
   aura::Window* GetAuraWindow() {
-    return ash::wm::WmWindowAura::GetAuraWindow(window_state_->window());
+    return ash::WmWindowAura::GetAuraWindow(window_state_->window());
   }
 
   // Overridden from ash::wm::WindowStateDelegate: