Shuffles and renames ash/common/wm classes

ash/test/ui_controls_factory_ash.cc

Index: ash/test/ui_controls_factory_ash.cc
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc
index 5fa98bce34c347b058c8ff23b164eafa1dbe0473..3ab880f3949b60dd6140957c50010c346e68f0fc 100644
--- a/ash/test/ui_controls_factory_ash.cc
+++ b/ash/test/ui_controls_factory_ash.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/shell.h"
 #include "ash/shell_factory.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/screen_position_client.h"
@@ -46,8 +46,8 @@ UIControlsAura* GetUIControlsForRootWindow(aura::Window* root_window) {
 // Returns the UIControls object for the RootWindow at |point_in_screen|.
 UIControlsAura* GetUIControlsAt(const gfx::Point& point_in_screen) {
   // TODO(mazda): Support the case passive grab is taken.
-  return GetUIControlsForRootWindow(wm::WmWindowAura::GetAuraWindow(
-      ash::wm::GetRootWindowAt(point_in_screen)));
+  return GetUIControlsForRootWindow(
+      WmWindowAura::GetAuraWindow(ash::wm::GetRootWindowAt(point_in_screen)));
 }
 
 }  // namespace