Moves mash/wm into ash/mus

ash/mus/layout_manager_unittest.cc

Index: ash/mus/layout_manager_unittest.cc
diff --git a/mash/wm/layout_manager_unittest.cc b/ash/mus/layout_manager_unittest.cc
similarity index 79%
rename from mash/wm/layout_manager_unittest.cc
rename to ash/mus/layout_manager_unittest.cc
index 1ddbfe3c37ea70e7a12896e6deb1b202b8ab0cf1..2b74f381641b0adf9e09e922508a78c8ebfd45ca 100644
--- a/mash/wm/layout_manager_unittest.cc
+++ b/ash/mus/layout_manager_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/layout_manager.h"
+#include "ash/mus/layout_manager.h"
 
 #include <memory>
 
@@ -10,12 +10,12 @@
 #include "components/mus/public/cpp/tests/test_window.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class TestLayoutManager : public LayoutManager {
  public:
-  explicit TestLayoutManager(mus::Window* window)
+  explicit TestLayoutManager(::mus::Window* window)
       : LayoutManager(window), layout_called_(false) {}
   ~TestLayoutManager() override {}
 
@@ -27,9 +27,7 @@ class TestLayoutManager : public LayoutManager {
 
  private:
   // LayoutManager:
-  void LayoutWindow(mus::Window* window) override {
-    layout_called_ = true;
-  }
+  void LayoutWindow(::mus::Window* window) override { layout_called_ = true; }
 
   bool layout_called_;
 
@@ -38,8 +36,8 @@ class TestLayoutManager : public LayoutManager {
 
 // Tests that owning window can be destroyed before the layout manager.
 TEST(LayoutManagerTest, OwningWindowDestroyedFirst) {
-  std::unique_ptr<mus::TestWindow> parent(new mus::TestWindow(1));
-  mus::TestWindow child(2);
+  std::unique_ptr<::mus::TestWindow> parent(new ::mus::TestWindow(1));
+  ::mus::TestWindow child(2);
   TestLayoutManager layout_manager(parent.get());
   parent->AddChild(&child);
   EXPECT_TRUE(layout_manager.GetAndResetLayoutCalled());
@@ -49,8 +47,8 @@ TEST(LayoutManagerTest, OwningWindowDestroyedFirst) {
 
 // Tests that the layout manager can be destroyed before the owning window.
 TEST(LayoutManagerTest, LayoutManagerDestroyedFirst) {
-  mus::TestWindow parent(1);
-  mus::TestWindow child(2);
+  ::mus::TestWindow parent(1);
+  ::mus::TestWindow child(2);
   std::unique_ptr<TestLayoutManager> layout_manager(
       new TestLayoutManager(&parent));
   parent.AddChild(&child);
@@ -63,5 +61,5 @@ TEST(LayoutManagerTest, LayoutManagerDestroyedFirst) {
   parent.SetBounds(gfx::Rect(200, 100));
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash