chromeos: Makes AshTestBase/Helper target mash when appropriate

ash/BUILD.gn

Index: ash/BUILD.gn
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index c4f80f3137204470549ddc6ad5bc9a308582db40..df8cbed3bb39d42b4882faa7e3fc3141194932cc 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",

[msw, 2017/02/19 21:49:19]

Are these (and the new //ui/gl:test_support dep) needed here? It seems like they
are already included in //ash/test:test_support_common, which should be pulled
in transitively through existing deps: //ash/test:ash_with_aura_test_support and
//ash/test:test_support_with_content. Tangentially, it seems like these files
aren't content-specific (the header includes ash_test_environment.h, not
ash_test_environment_content.h, nothing in either that looks content related)

[sky, 2017/02/21 17:06:50]

Mash has it's own TestSuite that is different than that of ash. Previously
ash_test_suite was in //ash/test:test_support_common. //ash:common_unittests
depends upon //ash/test:test_support_common. This means I can't keep
ash_test_suite in test_support_common and needed to move it to the test
executables that are using it (ash_content_unittests, ash_unittests and exo).

ash_test_suite depends upon //ui/gl:test_support, so it's needed as a dep here
(removing the dep results in gn --check errors).

[msw, 2017/02/22 06:25:48]

Hmm, couldn't two separate TestSuite subclasses be included in a target (via
deps and sources), and then each test target could explicitly instantiate and
use the one it needs? I guess I don't understand why we need to move
ash_test_suite out of //ash/test:test_support_common, unless you're trying to
avoid including it in targets where it's simply not used.

[sky, 2017/02/22 16:32:04]

I think you're suggesting a separate target for the test suites? ash_test_suite
includes some files in ash/test. This means I would need to restructure
test_support_common, which didn't seem worth it.

+    "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,59 @@ test("ash_content_unittests") {
   ]
 }
 
+# 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") {
+  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",

[msw, 2017/02/19 21:49:19]

Similarly, isn't this already included in test_support_without_content (a direct
dep here)?

[sky, 2017/02/21 17:06:50]

Removed.

+  ]
+  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 +1312,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",

[msw, 2017/02/19 21:49:19]

ditto question

[sky, 2017/02/21 17:06:50]

Same answer as above.

+    "test/ash_test_suite.h",
     "test/ash_unittests.cc",
     "tooltips/tooltip_controller_unittest.cc",
     "touch/touch_observer_hud_unittest.cc",
@@ -1317,8 +1370,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 +1419,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",