Moves mash/wm into ash/mus

ash/mus/test/wm_test_screen.cc

Index: ash/mus/test/wm_test_screen.cc
diff --git a/mash/wm/test/wm_test_screen.cc b/ash/mus/test/wm_test_screen.cc
similarity index 95%
rename from mash/wm/test/wm_test_screen.cc
rename to ash/mus/test/wm_test_screen.cc
index e4dce60f22b118f830352e7a1771feeff700dd54..ba51b815c400f859f9e2c5c51c957a5c1f182bef 100644
--- a/mash/wm/test/wm_test_screen.cc
+++ b/ash/mus/test/wm_test_screen.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/test/wm_test_screen.h"
+#include "ash/mus/test/wm_test_screen.h"
 
 #include "ui/aura/window.h"
 #include "ui/display/display_finder.h"
@@ -10,8 +10,8 @@
 #undef NOTIMPLEMENTED
 #define NOTIMPLEMENTED() DVLOG(1) << "notimplemented"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 WmTestScreen::WmTestScreen() {
   display::Screen::SetScreenInstance(this);
@@ -80,5 +80,5 @@ void WmTestScreen::RemoveObserver(display::DisplayObserver* observer) {
   display_list_.RemoveObserver(observer);
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash