Moves mash/wm into ash/mus

ash/mus/test/wm_test_screen.h

Index: ash/mus/test/wm_test_screen.h
diff --git a/mash/wm/test/wm_test_screen.h b/ash/mus/test/wm_test_screen.h
similarity index 88%
rename from mash/wm/test/wm_test_screen.h
rename to ash/mus/test/wm_test_screen.h
index 2849cd4d1f6684b7e9d430454d9533937d732eb1..4545804432cde15ca228e7a0671d05aed92744cc 100644
--- a/mash/wm/test/wm_test_screen.h
+++ b/ash/mus/test/wm_test_screen.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_WM_TEST_SCREEN_H_
-#define MASH_WM_WM_TEST_SCREEN_H_
+#ifndef ASH_MUS_TEST_WM_TEST_SCREEN_H_
+#define ASH_MUS_TEST_WM_TEST_SCREEN_H_
 
 #include "ui/display/screen.h"
 #include "ui/views/mus/display_list.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 // Screen implementation used by tests for the windowmanager. Does not talk
 // to mus. Tests must keep the list of Displays in sync manually.
@@ -42,7 +42,7 @@ class WmTestScreen : public display::Screen {
   DISALLOW_COPY_AND_ASSIGN(WmTestScreen);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_WM_TEST_SCREEN_H_
+#endif  // ASH_MUS_TEST_WM_TEST_SCREEN_H_