Adds more BUILD.gns to ash

ash/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//ui/base/ui_features.gni")
 
 assert(use_aura)
@@ skipping 995 matching lines @@
     "//ui/keyboard:keyboard_with_content",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
     "//ui/views/controls/webview",
     "//ui/web_dialogs",
     "//url",
   ]
 }
 
-# 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 = [
     "../ui/views/test/test_views_delegate_aura.cc",
     "shell/app_list.cc",
     "shell/bubble.cc",
     "shell/context_menu.cc",
     "shell/context_menu.h",
     "shell/example_factory.h",
     "shell/lock_view.cc",
     "shell/panel_window.cc",
     "shell/panel_window.h",
     "shell/shell_delegate_impl.cc",
     "shell/shell_delegate_impl.h",
     "shell/toplevel_window.cc",
     "shell/toplevel_window.h",
     "shell/widgets.cc",
     "shell/window_type_launcher.cc",
     "shell/window_type_launcher.h",
     "shell/window_watcher.cc",
     "shell/window_watcher.h",
     "shell/window_watcher_shelf_item_delegate.cc",
     "shell/window_watcher_shelf_item_delegate.h",
   ]
 
   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",
     "//net",
     "//skia",
     "//third_party/icu",
     "//ui/app_list/presenter",
     "//ui/aura",
     "//ui/base",
     "//ui/base/ime",
@@ skipping 61 matching lines @@
     "content/keyboard_overlay/keyboard_overlay_view_unittest.cc",
     "test/ash_unittests.cc",
   ]
   configs += [
     "//build/config:precompiled_headers",
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
   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",
     "//components/user_manager",
     "//content/public/browser",
     "//content/test:test_support",
     "//mojo/edk/system",
     "//skia",
     "//testing/gtest",
     "//ui/aura",
@@ skipping 45 matching lines @@
     "common/frame/default_header_painter_unittest.cc",
     "common/material_design/material_design_controller_unittest.cc",
     "common/metrics/pointer_metrics_recorder_unittest.cc",
     "common/popup_message_unittest.cc",
     "common/shelf/shelf_background_animator_unittest.cc",
     "common/shelf/shelf_button_pressed_metric_tracker_unittest.cc",
     "common/shelf/shelf_locking_manager_unittest.cc",
     "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",
     "common/system/chromeos/palette/mock_palette_tool_delegate.h",
     "common/system/chromeos/palette/palette_tool_manager_unittest.cc",
     "common/system/chromeos/palette/tools/create_note_unittest.cc",
     "common/system/chromeos/palette/tools/screenshot_unittest.cc",
     "common/system/chromeos/power/power_status_unittest.cc",
     "common/system/chromeos/power/power_status_view_unittest.cc",
     "common/system/chromeos/power/tray_power_unittest.cc",
@@ skipping 102 matching lines @@
     "wm/window_animations_unittest.cc",
     "wm/window_cycle_controller_unittest.cc",
     "wm/window_manager_unittest.cc",
     "wm/window_modality_controller_unittest.cc",
     "wm/window_positioner_unittest.cc",
     "wm/window_state_unittest.cc",
     "wm/window_util_unittest.cc",
     "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",
     "wm/workspace_controller_unittest.cc",
   ]
   configs += [
     "//build/config:precompiled_headers",
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
   deps = [
     ":ash",
-    ":ash_with_aura_test_support",
-    ":test_support_without_content",
     "//ash/autoclick/common:autoclick",
+    "//ash/common:unittests",

[msw, 2016/10/07 22:02:24]

q: sanity check (my memory is fuzzy); this is sufficient to run the
ash/common:unittests source-set's tests in ash_unittests, right?

[sky, 2016/10/07 22:23:14]

Indeed it is.

     "//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",
     "//components/signin/core/account_id",
     "//components/user_manager",
     "//mojo/edk/system",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/icu",
@@ skipping 116 matching lines @@
   if (is_win) {
     configs -= [ "//build/config/win:console" ]
     configs += [ "//build/config/win:windowed" ]
     deps += [ "//sandbox" ]
   }
 
   if (is_chromeos) {
     deps += [ "//device/bluetooth" ]
   }
 }