Make aura work with mus

ui/aura/BUILD.gn

Index: ui/aura/BUILD.gn
diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
index fd4fc494b54bff783981c8376095b127b671a82c..f9ae50223df507b60aa18c15dfe2984c96870ac8 100644
--- a/ui/aura/BUILD.gn
+++ b/ui/aura/BUILD.gn
@@ -67,12 +67,34 @@ component("aura") {
     "input_state_lookup_win.h",
     "layout_manager.cc",
     "layout_manager.h",
+    "mus/in_flight_change.cc",
+    "mus/in_flight_change.h",
+    "mus/input_method_mus.cc",
+    "mus/input_method_mus.h",
+    "mus/mus_types.h",
     "mus/mus_util.cc",
     "mus/mus_util.h",
+    "mus/property_converter.h",
+    "mus/surface_id_handler.h",
+    "mus/text_input_client_impl.cc",
+    "mus/text_input_client_impl.h",
+    "mus/window_manager_delegate.cc",
+    "mus/window_manager_delegate.h",
+    "mus/window_mus.h",
+    "mus/window_port_mus.cc",
+    "mus/window_port_mus.h",
+    "mus/window_tree_client.cc",
+    "mus/window_tree_client.h",
+    "mus/window_tree_client_delegate.cc",
+    "mus/window_tree_client_delegate.h",
+    "mus/window_tree_client_observer.h",
+    "mus/window_tree_host_mus.cc",
+    "mus/window_tree_host_mus.h",
     "scoped_window_targeter.cc",
     "scoped_window_targeter.h",
     "window.cc",
     "window.h",
+    "window_delegate.cc",
     "window_delegate.h",
     "window_event_dispatcher.cc",
     "window_event_dispatcher.h",
@@ -102,6 +124,9 @@ component("aura") {
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
+    "//cc/surfaces:surface_id",
+    "//services/service_manager/public/cpp",
+    "//services/ui/public/interfaces",
     "//skia",
     "//ui/base",
     "//ui/base/ime",
@@ -113,6 +138,8 @@ component("aura") {
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/platform_window",
+    "//ui/platform_window/mojo",
+    "//ui/platform_window/stub",
   ]
 
   if (use_x11) {
@@ -158,6 +185,8 @@ component("aura") {
 static_library("test_support") {
   testonly = true
   sources = [
+    "test/aura_mus_test_base.cc",
+    "test/aura_mus_test_base.h",
     "test/aura_test_base.cc",
     "test/aura_test_base.h",
     "test/aura_test_helper.cc",
@@ -169,6 +198,12 @@ static_library("test_support") {
     "test/event_generator_delegate_aura.h",
     "test/input_method_glue.cc",
     "test/input_method_glue.h",
+    "test/mus/test_window_tree.cc",
+    "test/mus/test_window_tree.h",
+    "test/mus/test_window_tree_client_setup.cc",
+    "test/mus/test_window_tree_client_setup.h",
+    "test/mus/window_tree_client_private.cc",
+    "test/mus/window_tree_client_private.h",
     "test/test_cursor_client.cc",
     "test/test_cursor_client.h",
     "test/test_focus_client.cc",
@@ -195,6 +230,7 @@ static_library("test_support") {
     ":aura",
   ]
   deps = [
+    "//services/ui/public/interfaces",
     "//skia",
     "//testing/gtest",
     "//ui/base:test_support",
@@ -264,6 +300,7 @@ executable("demo") {
 test("aura_unittests") {
   sources = [
     "gestures/gesture_recognizer_unittest.cc",
+    "mus/window_tree_client_unittest.cc",
     "test/run_all_unittests.cc",
     "window_event_dispatcher_unittest.cc",
     "window_targeter_unittest.cc",
@@ -274,6 +311,7 @@ test("aura_unittests") {
   deps = [
     ":test_support",
     "//base/test:test_support",
+    "//mojo/common",
     "//skia",
     "//testing/gtest",
     "//ui/base:test_support",