Shuffles and renames ash/common/wm classes

ash/extended_desktop_unittest.cc

Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index a2e68716bfbbf8b5dcb8cf8d4bb9389cdf5c043a..90cb81e91ea363c86f8b76681e9e04edde206e48 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -2,6 +2,7 @@
 // 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/shell_window_ids.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/display/display_manager.h"
@@ -10,7 +11,6 @@
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/string_util.h"
@@ -315,23 +315,23 @@ TEST_F(ExtendedDesktopTest, GetRootWindowAt) {
   SetSecondaryDisplayLayout(display::DisplayPlacement::LEFT);
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
-  EXPECT_EQ(root_windows[1], wm::WmWindowAura::GetAuraWindow(
+  EXPECT_EQ(root_windows[1], WmWindowAura::GetAuraWindow(
                                  wm::GetRootWindowAt(gfx::Point(-400, 100))));
-  EXPECT_EQ(root_windows[1], wm::WmWindowAura::GetAuraWindow(
+  EXPECT_EQ(root_windows[1], WmWindowAura::GetAuraWindow(
                                  wm::GetRootWindowAt(gfx::Point(-1, 100))));
-  EXPECT_EQ(root_windows[0], wm::WmWindowAura::GetAuraWindow(
+  EXPECT_EQ(root_windows[0], WmWindowAura::GetAuraWindow(
                                  wm::GetRootWindowAt(gfx::Point(0, 300))));
-  EXPECT_EQ(root_windows[0], wm::WmWindowAura::GetAuraWindow(
+  EXPECT_EQ(root_windows[0], WmWindowAura::GetAuraWindow(
                                  wm::GetRootWindowAt(gfx::Point(700, 300))));
 
   // Zero origin.
-  EXPECT_EQ(root_windows[0], wm::WmWindowAura::GetAuraWindow(
-                                 wm::GetRootWindowAt(gfx::Point(0, 0))));
+  EXPECT_EQ(root_windows[0],
+            WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(gfx::Point(0, 0))));
 
   // Out of range point should return the nearest root window
-  EXPECT_EQ(root_windows[1], wm::WmWindowAura::GetAuraWindow(
+  EXPECT_EQ(root_windows[1], WmWindowAura::GetAuraWindow(
                                  wm::GetRootWindowAt(gfx::Point(-600, 0))));
-  EXPECT_EQ(root_windows[0], wm::WmWindowAura::GetAuraWindow(
+  EXPECT_EQ(root_windows[0], WmWindowAura::GetAuraWindow(
                                  wm::GetRootWindowAt(gfx::Point(701, 100))));
 }
 
@@ -346,42 +346,42 @@ TEST_F(ExtendedDesktopTest, GetRootWindowMatching) {
 
   // Containing rect.
   EXPECT_EQ(root_windows[1],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(-300, 10, 50, 50))));
   EXPECT_EQ(root_windows[0],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(100, 10, 50, 50))));
 
   // Intersecting rect.
   EXPECT_EQ(root_windows[1],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(-200, 0, 300, 300))));
   EXPECT_EQ(root_windows[0],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(-100, 0, 300, 300))));
 
   // Zero origin.
   EXPECT_EQ(root_windows[0],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(0, 0, 0, 0))));
   EXPECT_EQ(root_windows[0],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(0, 0, 1, 1))));
 
   // Empty rect.
   EXPECT_EQ(root_windows[1],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(-400, 100, 0, 0))));
   EXPECT_EQ(root_windows[0],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(100, 100, 0, 0))));
 
   // Out of range rect should return the primary root window.
   EXPECT_EQ(root_windows[0],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(-600, -300, 50, 50))));
   EXPECT_EQ(root_windows[0],
-            wm::WmWindowAura::GetAuraWindow(
+            WmWindowAura::GetAuraWindow(
                 wm::GetRootWindowMatching(gfx::Rect(0, 1000, 50, 50))));
 }