mac: Let memory and tot bots use the same test list as the main waterfall bots.

This ensures that the memory and clang tot bots run the same tests as the
main waterfall bots.

Everything running on the main waterfall should also be tested under ASan,
and it must be tested with clang/tot too to make sure compiler updates don't
break anything. This change makes it impossible for things to get out of sync
(on mac).

If https://chromium-review.googlesource.com/c/chromium/src/+/1088754 hadn't
been reverted, this would've been behavior-preserving. As-is, it adds
headless_browsertests and headless_unittests to the mac asan bot and the
clang tot bots (which is fine).

Bug: 843511
Change-Id: I5e3cea35d99d630d7eb41154984abc23defe6219
Reviewed-on: https://chromium-review.googlesource.com/1089136
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564974}

testing/buildbot/chromium.clang.json

@@ -13411,6 +13411,18 @@
         },
         "test": "gpu_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "headless_browsertests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "headless_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -13915,6 +13927,18 @@
         },
         "test": "gpu_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "headless_browsertests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "headless_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/chromium.memory.json

@@ -5755,6 +5755,18 @@
         },
         "test": "gpu_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "headless_browsertests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "headless_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/test_suites.pyl

@@ -2503,16 +2503,6 @@
     'telemetry_perf_unittests_isolated_scripts',
   ],
 
-  'chromium_mac_clang_gtests': [
-    'chromium_gtests',
-    'chromium_gtests_for_devices_with_graphical_output',
-    'linux_and_mac_specific_chromium_gtests',
-    'mac_specific_chromium_gtests',
-    'non_android_chromium_gtests',
-    'non_android_and_cast_and_chromeos_chromium_gtests',
-    'non_linux_chromium_gtests',
-  ],
-
   'chromium_mac_fyi_gtests': [
     'chromium_gtests',
     'chromium_gtests_for_devices_with_graphical_output',
@@ -2563,16 +2553,6 @@
     'vr_platform_specific_chromium_gtests',
   ],
 
-  'chromium_memory_mac_gtests': [
-    'chromium_gtests',
-    'chromium_gtests_for_devices_with_graphical_output',
-    'linux_and_mac_specific_chromium_gtests',
-    'mac_specific_chromium_gtests',
-    'non_android_chromium_gtests',
-    'non_android_and_cast_and_chromeos_chromium_gtests',
-    'non_linux_chromium_gtests',
-  ],
-
   'chromium_win_10_fast_ring_gtests': [
     # Same as chromium_win_clang_gtests but with interactive_ui_tests.
     'aura_gtests',

testing/buildbot/waterfalls.pyl

@@ -665,13 +665,13 @@
       },
       'ToTMac': {
         'test_suites': {
-          'gtest_tests': 'chromium_mac_clang_gtests',
+          'gtest_tests': 'chromium_mac_gtests',
           'isolated_scripts': 'chromium_rel_isolated_scripts',
         },
       },
       'ToTMacASan': {
         'test_suites': {
-          'gtest_tests': 'chromium_mac_clang_gtests',
+          'gtest_tests': 'chromium_mac_gtests',
         },
       },
       'ToTWin': {
@@ -2839,7 +2839,7 @@
       },
       'Mac ASan 64 Tests (1)': {
         'test_suites': {
-          'gtest_tests': 'chromium_memory_mac_gtests',
+          'gtest_tests': 'chromium_mac_gtests',
         },
       },
     },