Moves mash/wm into ash/mus

ash/mus/test/wm_test_base.h

Index: ash/mus/test/wm_test_base.h
diff --git a/mash/wm/test/wm_test_base.h b/ash/mus/test/wm_test_base.h
similarity index 72%
rename from mash/wm/test/wm_test_base.h
rename to ash/mus/test/wm_test_base.h
index fb79e965ae6e1c32c9626612f9b190cfda85e9a3..c27c14acf26b0d2e2d9126fa8196e3f52afe87b6 100644
--- a/mash/wm/test/wm_test_base.h
+++ b/ash/mus/test/wm_test_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_TEST_WM_TEST_BASE_H_
-#define MASH_WM_TEST_WM_TEST_BASE_H_
+#ifndef ASH_MUS_TEST_WM_TEST_BASE_H_
+#define ASH_MUS_TEST_WM_TEST_BASE_H_
 
 #include <memory>
 #include <string>
@@ -24,8 +24,8 @@ namespace mus {
 class Window;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class RootWindowController;
 class WmTestHelper;
@@ -41,11 +41,11 @@ class WmTestBase : public testing::Test {
   bool SupportsMultipleDisplays() const;
 
   // Update the display configuration as given in |display_spec|.
-  // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
+  // See test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_spec);
 
-  mus::Window* GetPrimaryRootWindow();
-  mus::Window* GetSecondaryRootWindow();
+  ::mus::Window* GetPrimaryRootWindow();
+  ::mus::Window* GetSecondaryRootWindow();
 
   display::Display GetPrimaryDisplay();
   display::Display GetSecondaryDisplay();
@@ -54,13 +54,13 @@ class WmTestBase : public testing::Test {
   // NOTE: you can explicitly destroy the returned value if necessary, but it
   // will also be automatically destroyed when the WindowTreeClient is
   // destroyed.
-  mus::Window* CreateTestWindow(const gfx::Rect& bounds);
-  mus::Window* CreateTestWindow(const gfx::Rect& bounds,
-                                ui::wm::WindowType window_type);
+  ::mus::Window* CreateTestWindow(const gfx::Rect& bounds);
+  ::mus::Window* CreateTestWindow(const gfx::Rect& bounds,
+                                  ui::wm::WindowType window_type);
 
   // Creates a window parented to |parent|. The returned window is visible.
-  mus::Window* CreateChildTestWindow(mus::Window* parent,
-                                     const gfx::Rect& bounds);
+  ::mus::Window* CreateChildTestWindow(::mus::Window* parent,
+                                       const gfx::Rect& bounds);
 
  protected:
   // testing::Test:
@@ -79,7 +79,7 @@ class WmTestBase : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(WmTestBase);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_TEST_WM_TEST_BASE_H_
+#endif  // ASH_MUS_TEST_WM_TEST_BASE_H_