Shuffles and renames ash/common/wm classes

ash/wm/stacking_controller.cc

Index: ash/wm/stacking_controller.cc
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 45d7af894da5ec8a5b72980c8de859fcbc37f171..3bf2c77beb2097b1b0c14825e4ec47f033453b17 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -4,8 +4,8 @@
 
 #include "ash/wm/stacking_controller.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/container_finder.h"
-#include "ash/wm/aura/wm_window_aura.h"
 
 namespace ash {
 
@@ -22,8 +22,8 @@ StackingController::~StackingController() {}
 aura::Window* StackingController::GetDefaultParent(aura::Window* context,
                                                    aura::Window* window,
                                                    const gfx::Rect& bounds) {
-  return wm::WmWindowAura::GetAuraWindow(wm::GetDefaultParent(
-      wm::WmWindowAura::Get(context), wm::WmWindowAura::Get(window), bounds));
+  return WmWindowAura::GetAuraWindow(wm::GetDefaultParent(
+      WmWindowAura::Get(context), WmWindowAura::Get(window), bounds));
 }
 
 }  // namespace ash