Moves mash/wm into ash/mus

ash/mus/test/wm_test_helper.h

Index: ash/mus/test/wm_test_helper.h
diff --git a/mash/wm/test/wm_test_helper.h b/ash/mus/test/wm_test_helper.h
similarity index 76%
rename from mash/wm/test/wm_test_helper.h
rename to ash/mus/test/wm_test_helper.h
index 333d21dd4fb2d84338b1787277e7f8fd894fbef0..373ae58a379a9249828289e4f6e779aef67c1423 100644
--- a/mash/wm/test/wm_test_helper.h
+++ b/ash/mus/test/wm_test_helper.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_TEST_WM_TEST_HELPER_H_
-#define MASH_WM_TEST_WM_TEST_HELPER_H_
+#ifndef ASH_MUS_TEST_WM_TEST_HELPER_H_
+#define ASH_MUS_TEST_WM_TEST_HELPER_H_
 
 #include <memory>
 
+#include "ash/mus/window_manager_application.h"
 #include "base/macros.h"
 #include "components/mus/public/cpp/tests/test_window_tree_client_setup.h"
-#include "mash/wm/window_manager_application.h"
 
 namespace base {
 class MessageLoop;
@@ -23,8 +23,8 @@ namespace mus {
 class Window;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class WmTestScreen;
 
@@ -45,14 +45,14 @@ class WmTestHelper {
 
  private:
   std::unique_ptr<base::MessageLoop> message_loop_;
-  mus::TestWindowTreeClientSetup window_tree_client_setup_;
+  ::mus::TestWindowTreeClientSetup window_tree_client_setup_;
   WindowManagerApplication window_manager_app_;
   WmTestScreen* screen_ = nullptr;  // Owned by |window_manager_app_|.
 
   DISALLOW_COPY_AND_ASSIGN(WmTestHelper);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_TEST_WM_TEST_HELPER_H_
+#endif  // ASH_MUS_TEST_WM_TEST_HELPER_H_