chromeos: Makes AshTestBase/Helper target mash when appropriate

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")
 
 # Historical note: Ash shipped on Windows for a couple years to support
@@ skipping 1082 matching lines @@
   ]
 }
 
 # This target is intended for tests that use content. In general very few tests
 # need or use content and should be placed in |ash_unittests| instead.
 test("ash_content_unittests") {
   sources = [
     "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 += [
     "//build/config:precompiled_headers",
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
   deps = [
     ":ash",
     ":ash_with_content",
@@ skipping 14 matching lines @@
     "//device/bluetooth",
     "//mojo/edk/system",
     "//net",
     "//skia",
     "//testing/gtest",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/chromeos",
     "//ui/display",
     "//ui/display:test_support",
+    "//ui/gl:test_support",
     "//ui/message_center",
     "//ui/message_center:test_support",
     "//ui/views",
     "//ui/views:test_support",
     "//ui/views/controls/webview:test_support",
     "//ui/web_dialogs:test_support",
   ]
 
   data_deps = [
     "//ash/common/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_with_content_100_percent",
     "//ash/resources:ash_test_resources_200_percent",
   ]
 }
 
+# This target includes the tests that are run by both ash and mash. Eventually
+# the majority of tests in |ash_unittests| should move here.
+source_set("common_unittests") {

[James Cook, 2017/02/18 02:23:20]

Does this duplicate the list in ash/common/BUILD.gn? Can that file be deleted
now?

[sky, 2017/02/18 18:00:56]

It does indeed and includes one new file. The plan is to add more tests, but I
wanted to start with this first. ash/common/BUILD.gn has been nuked.

+  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",
     "app_list/app_list_presenter_delegate_unittest.cc",
     "ash_touch_exploration_manager_chromeos_unittest.cc",
     "aura/pointer_watcher_adapter_unittest.cc",
     "autoclick/autoclick_unittest.cc",
     "common/devtools/ash_devtools_unittest.cc",
     "common/session/session_controller_unittest.cc",
 
@@ skipping 87 matching lines @@
     "sticky_keys/sticky_keys_unittest.cc",
     "system/chromeos/power/power_event_observer_unittest.cc",
     "system/chromeos/power/tablet_power_button_controller_unittest.cc",
     "system/chromeos/power/video_activity_notifier_unittest.cc",
     "system/chromeos/rotation/tray_rotation_lock_unittest.cc",
     "system/chromeos/screen_layout_observer_unittest.cc",
     "system/overview/overview_button_tray_unittest.cc",
     "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",
     "utility/screenshot_controller_unittest.cc",
     "virtual_keyboard_controller_unittest.cc",
     "wm/always_on_top_controller_unittest.cc",
     "wm/ash_focus_rules_unittest.cc",
     "wm/ash_native_cursor_manager_unittest.cc",
     "wm/dock/docked_window_layout_manager_unittest.cc",
     "wm/dock/docked_window_resizer_unittest.cc",
@@ skipping 35 matching lines @@
     "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",
+    ":common_unittests",
     "//ash/autoclick/common:autoclick",
-    "//ash/common:unittests",
     "//ash/common/strings",
     "//ash/common/test:test_support",
     "//ash/public/cpp:ash_public_cpp",
     "//ash/public/interfaces",
     "//ash/resources",
     "//ash/resources/vector_icons",
     "//ash/test:ash_with_aura_test_support",
     "//ash/test:test_support_without_content",
     "//ash/touch_hud",
     "//base",
@@ skipping 27 matching lines @@
     "//ui/display",
     "//ui/display:test_support",
     "//ui/display/types",
     "//ui/events",
     "//ui/events:gesture_detection",
     "//ui/events:test_support",
     "//ui/events/devices",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
+    "//ui/gl:test_support",
     "//ui/keyboard",
     "//ui/message_center",
     "//ui/message_center:test_support",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
     "//ui/views:test_support",
     "//ui/wm",
     "//ui/wm:test_support",
     "//url",
@@ skipping 32 matching lines @@
     "//content/public/app:both",
     "//device/bluetooth",
   ]
 
   data_deps = [
     "//ash/common/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_with_content_100_percent",
     "//ash/resources:ash_test_resources_200_percent",
   ]
 }