Shuffles and renames ash/common/wm classes

ash/wm/always_on_top_controller_unittest.cc

Index: ash/wm/always_on_top_controller_unittest.cc
diff --git a/ash/wm/always_on_top_controller_unittest.cc b/ash/wm/always_on_top_controller_unittest.cc
index f74b9684f003fdf76bdc8a0ad98e25722d38ef42..386f36a907a650a7a908dda78fba4ef48fe322ef 100644
--- a/ash/wm/always_on_top_controller_unittest.cc
+++ b/ash/wm/always_on_top_controller_unittest.cc
@@ -4,13 +4,13 @@
 
 #include "ash/common/wm/always_on_top_controller.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "ui/keyboard/keyboard_controller.h"
@@ -38,7 +38,7 @@ class VirtualKeyboardAlwaysOnTopControllerTest : public AshTestBase {
 
 class TestLayoutManager : public WorkspaceLayoutManager {
  public:
-  explicit TestLayoutManager(wm::WmWindow* window)
+  explicit TestLayoutManager(WmWindow* window)
       : WorkspaceLayoutManager(window, nullptr),
         keyboard_bounds_changed_(false) {}
 
@@ -66,7 +66,7 @@ TEST_F(VirtualKeyboardAlwaysOnTopControllerTest, NotifyKeyboardBoundsChanged) {
       Shell::GetContainer(root_window, kShellWindowId_AlwaysOnTopContainer);
   // Install test layout manager.
   TestLayoutManager* manager =
-      new TestLayoutManager(wm::WmWindowAura::Get(always_on_top_container));
+      new TestLayoutManager(WmWindowAura::Get(always_on_top_container));
   RootWindowController* controller = Shell::GetPrimaryRootWindowController();
   AlwaysOnTopController* always_on_top_controller =
       controller->always_on_top_controller();