Shuffles and renames ash/common/wm classes

ash/shelf/shelf_window_watcher_unittest.cc

Index: ash/shelf/shelf_window_watcher_unittest.cc
diff --git a/ash/shelf/shelf_window_watcher_unittest.cc b/ash/shelf/shelf_window_watcher_unittest.cc
index 376502fb8eeb5855e1ce8bf1e0b142c88c45f8a6..343e6264239610dfe9a3e057d5a62f900b1a8e3f 100644
--- a/ash/shelf/shelf_window_watcher_unittest.cc
+++ b/ash/shelf/shelf_window_watcher_unittest.cc
@@ -5,6 +5,7 @@
 #include "ash/shelf/shelf_window_watcher.h"
 
 #include "ash/ash_switches.h"
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
@@ -14,7 +15,6 @@
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
@@ -227,7 +227,7 @@ TEST_F(ShelfWindowWatcherTest, DragWindow) {
 
   // Simulate dragging of |window| and check its item is not changed.
   std::unique_ptr<WindowResizer> resizer(
-      CreateWindowResizer(wm::WmWindowAura::Get(window.get()), gfx::Point(),
+      CreateWindowResizer(WmWindowAura::Get(window.get()), gfx::Point(),
                           HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE));
   ASSERT_TRUE(resizer.get());
   resizer->Drag(gfx::Point(50, 50), 0);
@@ -266,7 +266,7 @@ TEST_F(ShelfWindowWatcherTest, ReparentWindowDuringTheDragging) {
   // Simulate re-parenting to |new_parent| during the dragging.
   {
     std::unique_ptr<WindowResizer> resizer(
-        CreateWindowResizer(wm::WmWindowAura::Get(window.get()), gfx::Point(),
+        CreateWindowResizer(WmWindowAura::Get(window.get()), gfx::Point(),
                             HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(gfx::Point(50, 50), 0);