Converts ash to use aura-mus

ash/mus/test/wm_test_helper.h

Index: ash/mus/test/wm_test_helper.h
diff --git a/ash/mus/test/wm_test_helper.h b/ash/mus/test/wm_test_helper.h
index 20aea4936754f5d85e0c935dc35aab47f9ea71c7..5900711eca4dec3611677a8bfd8b215940efa432 100644
--- a/ash/mus/test/wm_test_helper.h
+++ b/ash/mus/test/wm_test_helper.h
@@ -9,7 +9,11 @@
 
 #include "ash/mus/window_manager_application.h"
 #include "base/macros.h"
-#include "services/ui/public/cpp/tests/test_window_tree_client_setup.h"
+#include "ui/aura/test/mus/test_window_tree_client_setup.h"
+
+namespace aura {
+class WindowTreeClientPrivate;
+}
 
 namespace base {
 class MessageLoop;
@@ -69,9 +73,9 @@ class WmTestHelper {
 
   std::unique_ptr<base::MessageLoop> message_loop_;
   std::unique_ptr<views::ViewsDelegate> views_delegate_;
-  ui::TestWindowTreeClientSetup window_tree_client_setup_;
+  aura::TestWindowTreeClientSetup window_tree_client_setup_;
   std::unique_ptr<WindowManagerApplication> window_manager_app_;
-  std::unique_ptr<ui::WindowTreeClientPrivate> window_tree_client_private_;
+  std::unique_ptr<aura::WindowTreeClientPrivate> window_tree_client_private_;
 
   // Id for the next Display created by CreateRootWindowController().
   int64_t next_display_id_ = 1;