Index: ui/views/mus/BUILD.gn |
diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn |
index cbc99f399bdfc2ceaac842d7ce3440d31a836646..c6dd151eda4a86ac8e7468f5e387222a2462b275 100644 |
--- a/ui/views/mus/BUILD.gn |
+++ b/ui/views/mus/BUILD.gn |
@@ -19,37 +19,19 @@ component("mus") { |
"clipboard_mus.h", |
"desktop_window_tree_host_mus.cc", |
"desktop_window_tree_host_mus.h", |
- "drag_drop_client_mus.cc", |
- "drag_drop_client_mus.h", |
- "drop_target_mus.cc", |
- "drop_target_mus.h", |
- "input_method_mus.cc", |
- "input_method_mus.h", |
"mus_client.cc", |
"mus_client.h", |
"mus_client_observer.h", |
"mus_export.h", |
- "native_widget_mus.cc", |
- "native_widget_mus.h", |
- "pointer_watcher_event_router.cc", |
- "pointer_watcher_event_router.h", |
"pointer_watcher_event_router2.cc", |
"pointer_watcher_event_router2.h", |
"screen_mus.cc", |
"screen_mus.h", |
"screen_mus_delegate.h", |
- "surface_context_factory.cc", |
- "surface_context_factory.h", |
- "text_input_client_impl.cc", |
- "text_input_client_impl.h", |
- "window_manager_connection.cc", |
- "window_manager_connection.h", |
"window_manager_constants_converters.cc", |
"window_manager_constants_converters.h", |
"window_manager_frame_values.cc", |
"window_manager_frame_values.h", |
- "window_tree_host_mus.cc", |
- "window_tree_host_mus.h", |
] |
defines = [ "VIEWS_MUS_IMPLEMENTATION" ] |
@@ -129,122 +111,6 @@ static_library("test_support") { |
testonly = true |
sources = [ |
- "../test/native_widget_factory_mus.cc", |
- "test_utils.h", |
- "views_mus_test_suite.cc", |
- "views_mus_test_suite.h", |
- ] |
- |
- deps = [ |
- ":mus", |
- "//base", |
- "//base/test:test_support", |
- "//services/service_manager/background:lib", |
- "//services/service_manager/public/cpp:sources", |
- "//services/ui/common:mus_common", |
- "//testing/gtest", |
- "//ui/aura", |
- "//ui/gl:test_support", |
- "//ui/resources", |
- "//ui/resources:ui_test_pak", |
- "//ui/views", |
- "//ui/views:test_support_internal", |
- ] |
- |
- data_deps = [ |
- "//ui/resources:ui_test_pak_data", |
- ] |
-} |
- |
-test("views_mus_unittests") { |
- testonly = true |
- |
- sources = [ |
- "input_method_mus_unittest.cc", |
- "native_widget_mus_unittest.cc", |
- "pointer_watcher_event_router_unittest.cc", |
- "run_all_unittests_mus.cc", |
- "screen_mus_unittest.cc", |
- "window_manager_connection_unittest.cc", |
- ] |
- |
- configs += [ "//build/config:precompiled_headers" ] |
- |
- deps = [ |
- ":mus", |
- ":test_support", |
- "//base", |
- "//base:i18n", |
- "//base/test:test_support", |
- "//cc", |
- "//net", |
- "//services/service_manager/background:main", # Provides main(). |
- "//services/ui/public/cpp", |
- "//services/ui/public/cpp:internal_or_test", |
- "//services/ui/public/cpp/tests:unittest_support", |
- "//services/ui/public/interfaces", |
- "//skia", |
- "//testing/gtest", |
- "//third_party/icu", |
- "//ui/accessibility", |
- "//ui/aura", |
- "//ui/aura:test_support", |
- "//ui/base", |
- "//ui/base:test_support", |
- "//ui/base/ime", |
- "//ui/compositor:test_support", |
- "//ui/events:dom_keycode_converter", |
- "//ui/events:events_base", |
- "//ui/events:test_support", |
- "//ui/events/platform", |
- "//ui/gfx:test_support", |
- "//ui/gfx/geometry", |
- "//ui/native_theme", |
- "//ui/strings", |
- "//ui/touch_selection", |
- "//ui/views", |
- "//ui/views:test_support_internal", |
- "//ui/views:views_unittests_sources", |
- "//ui/wm", |
- "//url", |
- ] |
- |
- data_deps = [ |
- ":unittests_manifest", |
- "//services/ui/ime/test_ime_driver", |
- "//services/ui/test_wm", |
- ] |
- |
- if (is_win) { |
- deps += [ |
- "//build/win:default_exe_manifest", |
- "//third_party/iaccessible2", |
- "//third_party/wtl", |
- ] |
- libs = [ |
- "imm32.lib", |
- "oleacc.lib", |
- "comctl32.lib", |
- ] |
- } |
- |
- if (use_x11) { |
- configs += [ |
- "//build/config/linux:x11", |
- "//build/config/linux:xext", |
- ] |
- deps += [ |
- "//ui/events/devices", |
- "//ui/events/platform/x11", |
- "//ui/gfx/x", |
- ] |
- } |
-} |
- |
-static_library("test_support_aura_mus") { |
- testonly = true |
- |
- sources = [ |
"../test/native_widget_factory_aura_mus.cc", |
"test_utils.h", |
"views_aura_mus_test_suite.cc", |
@@ -273,7 +139,7 @@ static_library("test_support_aura_mus") { |
] |
} |
-test("views_aura_mus_unittests") { |
+test("views_mus_unittests") { |
testonly = true |
sources = [ |
@@ -287,7 +153,7 @@ test("views_aura_mus_unittests") { |
deps = [ |
":mus", |
- ":test_support_aura_mus", |
+ ":test_support", |
"//base", |
"//base:i18n", |
"//base/test:test_support", |
@@ -322,7 +188,7 @@ test("views_aura_mus_unittests") { |
] |
data_deps = [ |
- ":unittests_aura_manifest", |
+ ":unittests_manifest", |
"//services/ui/ime/test_ime_driver", |
"//services/ui/test_wm", |
] |
@@ -407,11 +273,6 @@ service_manifest("unittests_manifest") { |
source = "unittests_manifest.json" |
} |
-service_manifest("unittests_aura_manifest") { |
- name = "views_aura_mus_unittests" |
- source = "unittests_aura_manifest.json" |
-} |
- |
service_manifest("interactive_ui_tests_manifest") { |
name = "views_mus_interactive_ui_tests" |
source = "interactive_ui_tests_manifest.json" |