Moves mash/wm into ash/mus

ash/mus/test/wm_test_helper.cc

Index: ash/mus/test/wm_test_helper.cc
diff --git a/mash/wm/test/wm_test_helper.cc b/ash/mus/test/wm_test_helper.cc
similarity index 78%
rename from mash/wm/test/wm_test_helper.cc
rename to ash/mus/test/wm_test_helper.cc
index fdf1723496a3ff57fce3575a858cfb31c815640b..7643d9184172bd3b69724165b8f7c58e352949cb 100644
--- a/mash/wm/test/wm_test_helper.cc
+++ b/ash/mus/test/wm_test_helper.cc
@@ -2,20 +2,20 @@
 // 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_helper.h"
+#include "ash/mus/test/wm_test_helper.h"
 
+#include "ash/mus/root_window_controller.h"
+#include "ash/mus/test/wm_test_screen.h"
+#include "ash/mus/window_manager.h"
+#include "ash/mus/window_manager.h"

[msw, 2016/06/02 20:28:34]

nit: remove duplicate include.

[sky, 2016/06/02 21:31:51]

Done.

+#include "ash/mus/window_manager_application.h"
 #include "base/message_loop/message_loop.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window_tree_client.h"
-#include "mash/wm/root_window_controller.h"
-#include "mash/wm/test/wm_test_screen.h"
-#include "mash/wm/window_manager.h"
-#include "mash/wm/window_manager.h"
-#include "mash/wm/window_manager_application.h"
 #include "ui/display/display.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 WmTestHelper::WmTestHelper() {}
 
@@ -44,11 +44,11 @@ void WmTestHelper::Init() {
   screen_->display_list()->AddDisplay(root_window_controller->display(),
                                       views::DisplayList::Type::PRIMARY);
 
-  window_tree_client_setup_.Init(
-      root_window_controller, root_window_controller->window_manager_.get());
+  window_tree_client_setup_.Init(root_window_controller,
+                                 root_window_controller->window_manager_.get());
   root_window_controller->root()->SetBounds(display_bounds);
   window_manager_app_.AddRootWindowController(root_window_controller);
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash