Shuffles and renames ash/common/wm classes

ash/test/ui_controls_factory_ash.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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"
 #include "ui/aura/env.h"
 #include "ui/aura/test/ui_controls_factory_aura.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/base/test/ui_controls_aura.h"
 #include "ui/display/screen.h"
@@ skipping 20 matching lines @@
         aura::test::CreateUIControlsAura(root_window->GetHost());
     // Pass the ownership to the |root_window|.
     root_window->SetProperty(kUIControlsKey, native_ui_control);
   }
   return native_ui_control;
 }
 
 // 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
 
 class UIControlsAsh : public UIControlsAura {
  public:
   UIControlsAsh() {
   }
   ~UIControlsAsh() override {}
 
@@ skipping 69 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
 };
 
 ui_controls::UIControlsAura* CreateAshUIControls() {
   return new ash::test::UIControlsAsh();
 }
 
 }  // namespace test
 }  // namespace ash