| Index: ui/wm/BUILD.gn
|
| diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn
|
| index e01ee9476ec07b657b693c92699126150362b562..186fb1186666a3495dcf822e64a9e6861cfc3aab 100644
|
| --- a/ui/wm/BUILD.gn
|
| +++ b/ui/wm/BUILD.gn
|
| @@ -89,58 +89,56 @@ component("wm") {
|
| }
|
|
|
| if (false) {
|
| + static_library("test_support") {
|
| + testonly = true
|
| + sources = [
|
| + "test/wm_test_helper.cc",
|
| + "test/wm_test_helper.h",
|
| + ]
|
|
|
| -static_library("test_support") {
|
| - testonly = true
|
| - sources = [
|
| - "test/wm_test_helper.cc",
|
| - "test/wm_test_helper.h",
|
| - ]
|
| -
|
| - deps = [
|
| - ":wm",
|
| - "//skia",
|
| - "//ui/aura",
|
| - "//ui/aura:test_support",
|
| - "//ui/base",
|
| - "//ui/events",
|
| - "//ui/events:events_base",
|
| - ]
|
| -}
|
| + deps = [
|
| + ":wm",
|
| + "//skia",
|
| + "//ui/aura",
|
| + "//ui/aura:test_support",
|
| + "//ui/base",
|
| + "//ui/events",
|
| + "//ui/events:events_base",
|
| + ]
|
| + }
|
|
|
| -test("wm_unittests") {
|
| - sources = [
|
| - "test/run_all_unittests.cc",
|
| - "core/compound_event_filter_unittest.cc",
|
| - "core/cursor_manager_unittest.cc",
|
| - "core/focus_controller_unittest.cc",
|
| - "core/input_method_event_filter_unittest.cc",
|
| - "core/image_grid_unittest.cc",
|
| - "core/nested_accelerator_controller_unittest.cc",
|
| - "core/shadow_controller_unittest.cc",
|
| - "core/transient_window_manager_unittest.cc",
|
| - "core/transient_window_stacking_client_unittest.cc",
|
| - "core/user_activity_detector_unittest.cc",
|
| - "core/visibility_controller_unittest.cc",
|
| - "core/window_animations_unittest.cc",
|
| - ]
|
| -
|
| - deps = [
|
| - ":test_support",
|
| - ":wm",
|
| - "//base",
|
| - "//base/test:test_support",
|
| - "//skia",
|
| - "//testing/gtest",
|
| - "//ui/aura:test_support",
|
| - "//ui/base:test_support",
|
| - "//ui/compositor:test_support",
|
| - "//ui/events:test_support",
|
| - "//ui/events/platform",
|
| - "//ui/gfx",
|
| - "//ui/gfx/geometry",
|
| - "//ui/gl",
|
| - ]
|
| -}
|
| + test("wm_unittests") {
|
| + sources = [
|
| + "test/run_all_unittests.cc",
|
| + "core/compound_event_filter_unittest.cc",
|
| + "core/cursor_manager_unittest.cc",
|
| + "core/focus_controller_unittest.cc",
|
| + "core/input_method_event_filter_unittest.cc",
|
| + "core/image_grid_unittest.cc",
|
| + "core/nested_accelerator_controller_unittest.cc",
|
| + "core/shadow_controller_unittest.cc",
|
| + "core/transient_window_manager_unittest.cc",
|
| + "core/transient_window_stacking_client_unittest.cc",
|
| + "core/user_activity_detector_unittest.cc",
|
| + "core/visibility_controller_unittest.cc",
|
| + "core/window_animations_unittest.cc",
|
| + ]
|
|
|
| + deps = [
|
| + ":test_support",
|
| + ":wm",
|
| + "//base",
|
| + "//base/test:test_support",
|
| + "//skia",
|
| + "//testing/gtest",
|
| + "//ui/aura:test_support",
|
| + "//ui/base:test_support",
|
| + "//ui/compositor:test_support",
|
| + "//ui/events:test_support",
|
| + "//ui/events/platform",
|
| + "//ui/gfx",
|
| + "//ui/gfx/geometry",
|
| + "//ui/gl",
|
| + ]
|
| + }
|
| } # if (false)
|
|
|