Index: ash/BUILD.gn |
diff --git a/ash/BUILD.gn b/ash/BUILD.gn |
index bf232dda6b1f03ec886373a6e6a8ae31a00a16b1..b5cccb51a543cca08028907582c4bd77222bd0d7 100644 |
--- a/ash/BUILD.gn |
+++ b/ash/BUILD.gn |
@@ -1013,228 +1013,6 @@ component("ash_with_content") { |
] |
} |
-# Used to test ash with an aura backend. |
-source_set("ash_with_aura_test_support") { |
- testonly = true |
- sources = [ |
- "test/ash_test_impl_aura.cc", |
- "test/ash_test_impl_aura.h", |
- ] |
- deps = [ |
- ":ash", |
- ":test_support_common", |
- "//base", |
- "//skia", |
- "//ui/aura:test_support", |
- "//ui/display", |
- "//ui/wm", |
- ] |
-} |
- |
-# Internal target consumed by |test_support_with_content| and |
-# |test_support_without_content|. This target contains all the test support |
-# files, with the exception of an implementation of AshTestEnvironment. |
-# Consumers of ash should use one of |test_support_with_content| or |
-# |test_support_without_content|. |
-static_library("test_support_common") { |
- testonly = true |
- visibility = [ ":*" ] |
- sources = [ |
- "common/test/ash_test.cc", |
- "common/test/ash_test.h", |
- "common/test/ash_test_impl.h", |
- "common/test/material_design_controller_test_api.cc", |
- "common/test/material_design_controller_test_api.h", |
- "common/test/test_palette_delegate.cc", |
- "common/test/test_palette_delegate.h", |
- "common/test/test_session_state_delegate.cc", |
- "common/test/test_session_state_delegate.h", |
- "common/test/test_volume_control_delegate.cc", |
- "common/test/test_volume_control_delegate.h", |
- "shell/toplevel_window.cc", |
- "shell/toplevel_window.h", |
- "test/ash_md_test_base.cc", |
- "test/ash_md_test_base.h", |
- "test/ash_test_base.cc", |
- "test/ash_test_base.h", |
- "test/ash_test_environment.h", |
- "test/ash_test_helper.cc", |
- "test/ash_test_helper.h", |
- "test/ash_test_views_delegate.cc", |
- "test/ash_test_views_delegate.h", |
- "test/child_modal_window.cc", |
- "test/child_modal_window.h", |
- "test/cursor_manager_test_api.cc", |
- "test/cursor_manager_test_api.h", |
- "test/display_manager_test_api.cc", |
- "test/display_manager_test_api.h", |
- "test/immersive_fullscreen_controller_test_api.cc", |
- "test/immersive_fullscreen_controller_test_api.h", |
- "test/mirror_window_test_api.cc", |
- "test/mirror_window_test_api.h", |
- "test/overflow_bubble_view_test_api.cc", |
- "test/overflow_bubble_view_test_api.h", |
- "test/shelf_button_pressed_metric_tracker_test_api.cc", |
- "test/shelf_button_pressed_metric_tracker_test_api.h", |
- "test/shelf_view_test_api.cc", |
- "test/shelf_view_test_api.h", |
- "test/shell_test_api.cc", |
- "test/shell_test_api.h", |
- "test/status_area_widget_test_helper.cc", |
- "test/status_area_widget_test_helper.h", |
- "test/task_switch_time_tracker_test_api.cc", |
- "test/task_switch_time_tracker_test_api.h", |
- "test/test_activation_delegate.cc", |
- "test/test_activation_delegate.h", |
- "test/test_keyboard_ui.cc", |
- "test/test_keyboard_ui.h", |
- "test/test_lock_state_controller_delegate.cc", |
- "test/test_lock_state_controller_delegate.h", |
- "test/test_overlay_delegate.cc", |
- "test/test_overlay_delegate.h", |
- "test/test_screenshot_delegate.cc", |
- "test/test_screenshot_delegate.h", |
- "test/test_session_state_animator.cc", |
- "test/test_session_state_animator.h", |
- "test/test_shelf_delegate.cc", |
- "test/test_shelf_delegate.h", |
- "test/test_shelf_item_delegate.cc", |
- "test/test_shelf_item_delegate.h", |
- "test/test_shell_delegate.cc", |
- "test/test_shell_delegate.h", |
- "test/test_suite.cc", |
- "test/test_suite.h", |
- "test/test_suite_init.h", |
- "test/test_suite_init.mm", |
- "test/test_system_tray_delegate.cc", |
- "test/test_system_tray_delegate.h", |
- "test/test_system_tray_item.cc", |
- "test/test_system_tray_item.h", |
- "test/test_wallpaper_delegate.cc", |
- "test/test_wallpaper_delegate.h", |
- "test/tray_cast_test_api.cc", |
- "test/tray_cast_test_api.h", |
- "test/ui_controls_factory_ash.cc", |
- "test/ui_controls_factory_ash.h", |
- "test/user_metrics_recorder_test_api.cc", |
- "test/user_metrics_recorder_test_api.h", |
- ] |
- configs += [ "//build/config:precompiled_headers" ] |
- |
- public_deps = [ |
- ":ash", |
- ] |
- deps = [ |
- "//ash/resources", |
- "//base:i18n", |
- "//base/test:test_support", |
- "//components/signin/core/account_id", |
- "//components/user_manager:user_manager", |
- "//device/bluetooth", |
- "//skia", |
- "//testing/gtest", |
- "//ui/accessibility", |
- "//ui/app_list:test_support", |
- "//ui/app_list/presenter", |
- "//ui/aura", |
- "//ui/aura:test_support", |
- "//ui/base:test_support", |
- "//ui/compositor:test_support", |
- "//ui/display/types", |
- "//ui/events:events_base", |
- "//ui/events:test_support", |
- "//ui/events/devices", |
- "//ui/gl", |
- "//ui/gl:test_support", |
- "//ui/keyboard", |
- "//ui/message_center", |
- "//ui/views", |
- "//ui/views:test_support", |
- "//ui/wm", |
- ] |
- |
- if (is_win) { |
- deps += [ "//ui/platform_window/win" ] |
- } |
- |
- if (use_x11) { |
- deps += [ "//ui/gfx/x" ] |
- } |
- |
- if (is_chromeos) { |
- deps += [ |
- "//chromeos", |
- "//ui/display", |
- ] |
- |
- sources += [ |
- "laser/laser_pointer_controller_test_api.cc", |
- "laser/laser_pointer_controller_test_api.h", |
- "laser/laser_pointer_points_test_api.cc", |
- "laser/laser_pointer_points_test_api.h", |
- ] |
- } |
-} |
- |
-static_library("test_support_without_content") { |
- testonly = true |
- sources = [ |
- "test/ash_test_environment_default.cc", |
- ] |
- |
- public_deps = [ |
- ":test_support_common", |
- ] |
- |
- deps = [ |
- "//base", |
- "//base/test:test_support", |
- "//skia", |
- ] |
-} |
- |
-static_library("test_support_with_content") { |
- testonly = true |
- sources = [ |
- "test/ash_test_environment_content.cc", |
- "test/ash_test_environment_content.h", |
- "test/content/test_shell_content_state.cc", |
- "test/content/test_shell_content_state.h", |
- ] |
- configs += [ "//build/config:precompiled_headers" ] |
- |
- public_deps = [ |
- ":ash_with_content", |
- ":test_support_common", |
- "//content/public/browser", |
- "//content/test:test_support", |
- "//skia", |
- ] |
-} |
- |
-static_library("interactive_ui_test_support") { |
- testonly = true |
- configs += [ "//build/config:precompiled_headers" ] |
- public_deps = [ |
- ":ash", |
- ":test_support_without_content", |
- ] |
- sources = [ |
- "test/ash_interactive_ui_test_base.cc", |
- "test/ash_interactive_ui_test_base.h", |
- ] |
- deps = [ |
- ":ash", |
- ":test_support_with_content", |
- "//base", |
- "//skia", |
- "//testing/gtest", |
- "//ui/aura", |
- "//ui/base", |
- "//ui/gl:test_support", |
- ] |
-} |
- |
static_library("ash_shell_lib") { |
testonly = true |
sources = [ |
@@ -1263,10 +1041,10 @@ static_library("ash_shell_lib") { |
deps = [ |
":ash", |
":ash_with_content", |
- ":test_support_without_content", |
"//ash/common/strings", |
"//ash/public/cpp", |
"//ash/resources", |
+ "//ash/test:test_support_without_content", |
"//base", |
"//base:i18n", |
"//components/user_manager", |
@@ -1348,10 +1126,10 @@ test("ash_content_unittests") { |
deps = [ |
":ash", |
- ":ash_with_aura_test_support", |
":ash_with_content", |
- ":test_support_with_content", |
"//ash/public/cpp", |
+ "//ash/test:ash_with_aura_test_support", |
+ "//ash/test:test_support_with_content", |
"//base", |
"//base/test:test_support", |
"//components/signin/core/account_id", |
@@ -1417,7 +1195,6 @@ test("ash_unittests") { |
"common/shelf/shelf_model_unittest.cc", |
"common/shelf/shelf_tooltip_manager_unittest.cc", |
"common/shelf/shelf_window_watcher_unittest.cc", |
- "common/system/chromeos/brightness/tray_brightness_unittest.cc", |
"common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc", |
"common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc", |
"common/system/chromeos/palette/mock_palette_tool_delegate.cc", |
@@ -1444,7 +1221,6 @@ test("ash_unittests") { |
"common/wm/overview/cleanup_animation_observer_unittest.cc", |
"common/wm/workspace/workspace_event_handler_test_helper.cc", |
"common/wm/workspace/workspace_event_handler_test_helper.h", |
- "common/wm_window_unittest.cc", |
"common/wm_window_user_data_unittest.cc", |
"dip_unittest.cc", |
"display/cursor_window_controller_unittest.cc", |
@@ -1540,7 +1316,6 @@ test("ash_unittests") { |
"wm/workspace/magnetism_matcher_unittest.cc", |
"wm/workspace/multi_window_resize_controller_unittest.cc", |
"wm/workspace/workspace_event_handler_unittest.cc", |
- "wm/workspace/workspace_layout_manager_unittest.cc", |
"wm/workspace/workspace_window_resizer_unittest.cc", |
"wm/workspace_controller_test_helper.cc", |
"wm/workspace_controller_test_helper.h", |
@@ -1553,12 +1328,14 @@ test("ash_unittests") { |
deps = [ |
":ash", |
- ":ash_with_aura_test_support", |
- ":test_support_without_content", |
"//ash/autoclick/common:autoclick", |
+ "//ash/common:unittests", |
"//ash/common/strings", |
+ "//ash/common/test:test_support", |
"//ash/public/cpp", |
"//ash/resources", |
+ "//ash/test:ash_with_aura_test_support", |
+ "//ash/test:test_support_without_content", |
"//ash/touch_hud", |
"//base", |
"//base/test:test_support", |