Moves mash/wm into ash/mus

ash/mus/screenlock_layout.cc

Index: ash/mus/screenlock_layout.cc
diff --git a/mash/wm/screenlock_layout.cc b/ash/mus/screenlock_layout.cc
similarity index 70%
rename from mash/wm/screenlock_layout.cc
rename to ash/mus/screenlock_layout.cc
index 3ed624157f1e6705ab3a498a4d6d5e6c8ce5739d..d207c8fb5214136b8961905ca86568117d0e7101 100644
--- a/mash/wm/screenlock_layout.cc
+++ b/ash/mus/screenlock_layout.cc
@@ -2,29 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/screenlock_layout.h"
+#include "ash/mus/screenlock_layout.h"
 
+#include "ash/mus/property_util.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
-#include "mash/wm/property_util.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
-ScreenlockLayout::ScreenlockLayout(mus::Window* owner) : LayoutManager(owner) {}
+ScreenlockLayout::ScreenlockLayout(::mus::Window* owner)
+    : LayoutManager(owner) {}
 ScreenlockLayout::~ScreenlockLayout() {}
 
 // We explicitly don't make assertions about the number of children in this
 // layout as the number of children can vary when the application providing the
 // screenlock restarts.
 
-void ScreenlockLayout::LayoutWindow(mus::Window* window) {
+void ScreenlockLayout::LayoutWindow(::mus::Window* window) {
   gfx::Rect bounds = owner()->bounds();
   bounds.Inset(-25, -25);
   window->SetBounds(bounds);
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash