Make aura work with mus

ui/aura/test/mus/window_tree_client_private.h

Index: ui/aura/test/mus/window_tree_client_private.h
diff --git a/services/ui/public/cpp/tests/window_tree_client_private.h b/ui/aura/test/mus/window_tree_client_private.h
similarity index 73%
copy from services/ui/public/cpp/tests/window_tree_client_private.h
copy to ui/aura/test/mus/window_tree_client_private.h
index bb2a3609fc81b10de7235d59296343d4b875221c..40f548a5fb4c9fc40f0d0eb1d3ad3d61c271f274 100644
--- a/services/ui/public/cpp/tests/window_tree_client_private.h
+++ b/ui/aura/test/mus/window_tree_client_private.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_TREE_CLIENT_PRIVATE_H_
-#define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_TREE_CLIENT_PRIVATE_H_
+#ifndef UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_
+#define UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
-#include "services/ui/common/types.h"
+#include "ui/aura/mus/mus_types.h"
 
 namespace display {
 class Display;
@@ -18,15 +18,17 @@ class Display;
 
 namespace ui {
 class Event;
-}
 
-namespace ui {
 namespace mojom {
 class WindowTree;
 }
+}
+
+namespace aura {
 
 class Window;
 class WindowTreeClient;
+class WindowTreeHost;
 
 // Use to access implementation details of WindowTreeClient.
 class WindowTreeClientPrivate {
@@ -36,9 +38,9 @@ class WindowTreeClientPrivate {
   ~WindowTreeClientPrivate();
 
   // Calls OnEmbed() on the WindowTreeClient.
-  void OnEmbed(mojom::WindowTree* window_tree);
+  void OnEmbed(ui::mojom::WindowTree* window_tree);
 
-  void CallWmNewDisplayAdded(const display::Display& display);
+  WindowTreeHost* CallWmNewDisplayAdded(const display::Display& display);
 
   // Pretends that |event| has been received from the window server.
   void CallOnWindowInputEvent(Window* window, std::unique_ptr<ui::Event> event);
@@ -46,7 +48,7 @@ class WindowTreeClientPrivate {
   void CallOnCaptureChanged(Window* new_capture, Window* old_capture);
 
   // Sets the WindowTree and client id.
-  void SetTreeAndClientId(mojom::WindowTree* window_tree,
+  void SetTreeAndClientId(ui::mojom::WindowTree* window_tree,
                           ClientSpecificId client_id);
 
   bool HasPointerWatcher();
@@ -60,4 +62,4 @@ class WindowTreeClientPrivate {
 
 }  // namespace ui
 
-#endif  // SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_TREE_CLIENT_PRIVATE_H_
+#endif  // UI_AURA_TEST_MUS_WINDOW_TREE_CLIENT_PRIVATE_H_