| Index: ash/BUILD.gn
|
| diff --git a/ash/BUILD.gn b/ash/BUILD.gn
|
| index c4f80f3137204470549ddc6ad5bc9a308582db40..af4d2ffcdf049b45e5b8da71e29d9c81ffdf99a9 100644
|
| --- a/ash/BUILD.gn
|
| +++ b/ash/BUILD.gn
|
| @@ -1100,6 +1100,8 @@ test("ash_content_unittests") {
|
| "content/display/screen_orientation_controller_chromeos_unittest.cc",
|
| "content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc",
|
| "content/keyboard_overlay/keyboard_overlay_view_unittest.cc",
|
| + "test/ash_test_suite.cc",
|
| + "test/ash_test_suite.h",
|
| "test/ash_unittests.cc",
|
| ]
|
| configs += [
|
| @@ -1134,6 +1136,7 @@ test("ash_content_unittests") {
|
| "//ui/chromeos",
|
| "//ui/display",
|
| "//ui/display:test_support",
|
| + "//ui/gl:test_support",
|
| "//ui/message_center",
|
| "//ui/message_center:test_support",
|
| "//ui/views",
|
| @@ -1149,10 +1152,57 @@ test("ash_content_unittests") {
|
| ]
|
| }
|
|
|
| +source_set("common_unittests") {
|
| + testonly = true
|
| + sources = [
|
| + "accelerators/accelerator_controller_unittest.cc",
|
| + "common/accelerators/accelerator_table_unittest.cc",
|
| + "common/drag_drop/drag_image_view_unittest.cc",
|
| + "common/mus_property_mirror_ash_unittest.cc",
|
| + "common/system/chromeos/audio/tray_audio_unittest.cc",
|
| + "common/system/chromeos/brightness/tray_brightness_unittest.cc",
|
| + "common/system/chromeos/network/vpn_list_unittest.cc",
|
| + "common/system/chromeos/screen_security/screen_tray_item_unittest.cc",
|
| + "common/system/chromeos/supervised/tray_supervised_user_unittest.cc",
|
| + "common/system/date/date_view_unittest.cc",
|
| + "common/system/update/tray_update_unittest.cc",
|
| + "common/wm/container_finder_unittest.cc",
|
| + "common/wm/mru_window_tracker_unittest.cc",
|
| + "common/wm/workspace/workspace_layout_manager_unittest.cc",
|
| + "common/wm_window_unittest.cc",
|
| + "common/wm_window_user_data_unittest.cc",
|
| + "test/ash_test_environment_default.cc",
|
| + ]
|
| + deps = [
|
| + "//ash",
|
| + "//ash/common/test:test_support",
|
| + "//ash/public/cpp:ash_public_cpp",
|
| + "//ash/public/interfaces",
|
| + "//ash/test:test_support_without_content",
|
| + "//base",
|
| + "//base/test:test_support",
|
| + "//services/ui/public/interfaces",
|
| + "//ui/app_list/presenter",
|
| + "//ui/app_list/presenter:test_support",
|
| + "//ui/aura",
|
| + "//ui/aura:test_support",
|
| + "//ui/base",
|
| + "//ui/base:test_support",
|
| + "//ui/display",
|
| + "//ui/events:test_support",
|
| + "//ui/keyboard",
|
| + "//ui/message_center",
|
| + "//ui/views",
|
| + "//ui/wm",
|
| + ]
|
| + public_deps = [
|
| + "//ash/test:test_support_without_content",
|
| + ]
|
| +}
|
| +
|
| test("ash_unittests") {
|
| sources = [
|
| "accelerators/accelerator_commands_unittest.cc",
|
| - "accelerators/accelerator_controller_unittest.cc",
|
| "accelerators/accelerator_filter_unittest.cc",
|
| "accelerators/magnifier_key_scroller_unittest.cc",
|
| "accelerators/spoken_feedback_toggler_unittest.cc",
|
| @@ -1260,8 +1310,9 @@ test("ash_unittests") {
|
| "system/toast/toast_manager_unittest.cc",
|
| "system/web_notification/ash_popup_alignment_delegate_unittest.cc",
|
| "system/web_notification/web_notification_tray_unittest.cc",
|
| - "test/ash_test_environment_default.cc",
|
| "test/ash_test_helper_unittest.cc",
|
| + "test/ash_test_suite.cc",
|
| + "test/ash_test_suite.h",
|
| "test/ash_unittests.cc",
|
| "tooltips/tooltip_controller_unittest.cc",
|
| "touch/touch_observer_hud_unittest.cc",
|
| @@ -1317,8 +1368,8 @@ test("ash_unittests") {
|
|
|
| deps = [
|
| ":ash",
|
| + ":common_unittests",
|
| "//ash/autoclick/common:autoclick",
|
| - "//ash/common:unittests",
|
| "//ash/common/strings",
|
| "//ash/common/test:test_support",
|
| "//ash/public/cpp:ash_public_cpp",
|
| @@ -1366,6 +1417,7 @@ test("ash_unittests") {
|
| "//ui/gfx",
|
| "//ui/gfx:test_support",
|
| "//ui/gfx/geometry",
|
| + "//ui/gl:test_support",
|
| "//ui/keyboard",
|
| "//ui/message_center",
|
| "//ui/message_center:test_support",
|
|
|