Add more test binaries to the memory bots.

Over time a bunch of suites got added to chromium_linux_gtests but
not to similar lists that run on memory bots. Fix this.

This adds this list of tests:
- openscreen_unittests (*)
- weblayer_browsertests
- weblayer_unittests
- x11_unittests
- xr_browser_tests

to the following bots:

On chromium.memory:
- Linux ASan LSan Tests (1)
- Linux CFI
- Linux MSan Tests
- Linux TSan Tests

On chromium.clang:
- CFI Linux ToT

*: openscreen_unittests currently fails on msan and cfi,
so it doesn't add them to the msan and cfi bots, see
crbug.com/1143946 and crbug.com/1143983

FYI:
jophba for openscreen_unittests, https://chromium-review.googlesource.com/c/chromium/src/+/2432762
msisov for x1_unittests, https://chromium-review.googlesource.com/c/chromium/src/+/2228652
bsheedy for xr_browser_tests, https://chromium-review.googlesource.com/c/chromium/src/+/1478403
jam for weblayer_*tests, https://chromium-review.googlesource.com/c/chromium/src/+/1865684

Bug: 843511,1025244,990756,933606,1143946,1143983
Cq-Include-Trybots: luci.chromium.try:linux_chromium_cfi_rel_ng
Cq-Include-Trybots: luci.chromium.try:linux_chromium_msan_rel_ng
Change-Id: I64048744649d74e0ab6790f732e06bbcdd42f5b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2507489
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#822535}

testing/buildbot/chromium.clang.json

@@ -1430,6 +1430,40 @@
         "test": "vr_pixeltests",
         "test_id_prefix": "ninja://chrome/browser/vr:vr_pixeltests/"
       },
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "weblayer_browsertests",
+        "test_id_prefix": "ninja://weblayer/test:weblayer_browsertests/"
+      },
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "weblayer_unittests",
+        "test_id_prefix": "ninja://weblayer/test:weblayer_unittests/"
+      },
       {
         "merge": {
           "args": [],
@@ -1464,6 +1498,41 @@
         "test": "wtf_unittests",
         "test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
       },
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "x11_unittests",
+        "test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
+      },
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "xr_browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "xr_browser_tests",
+        "test_id_prefix": "ninja://chrome/test:xr_browser_tests/"
+      },
       {
         "merge": {
           "args": [],
@@ -16059,23 +16128,6 @@
         "test": "net_unittests",
         "test_id_prefix": "ninja://net:net_unittests/"
       },
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Ubuntu-16.04"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "openscreen_unittests",
-        "test_id_prefix": "ninja://chrome/browser/media/router:openscreen_unittests/"
-      },
       {
         "merge": {
           "args": [],

testing/buildbot/test_suite_exceptions.pyl

@@ -2257,6 +2257,14 @@
       'ToTWinThinLTO64',
     ],
   },
+  'openscreen_unittests': {
+    'remove_from': [
+      'Linux MSan Tests',  # crbug.com/1143946
+      'ToTLinuxMSan',  # crbug.com/1143946
+      'Linux CFI',  # crbug.com/1143983
+      'CFI Linux ToT',  # crbug.com/1143983
+    ],
+  },
   'ozone_unittests': {
     'modifications': {
       'chromeos-betty-pi-arc-chrome': {

testing/buildbot/test_suites.pyl

@@ -4791,13 +4791,17 @@
       'chromium_gtests',
       'chromium_gtests_for_devices_with_graphical_output',
       'chromium_gtests_for_linux_and_chromeos_only',
+      'chromium_gtests_for_linux_and_mac_only',
+      'chromium_gtests_for_linux_only',
       'chromium_gtests_for_win_and_linux_only',
+      'linux_flavor_specific_chromium_gtests',
+      'linux_specific_xr_gtests',
       'gl_gtests_validating',
       'gpu_fyi_vulkan_swiftshader_gtests',
-      'linux_flavor_specific_chromium_gtests',
       'non_android_and_cast_and_chromeos_chromium_gtests',
       'non_android_chromium_gtests',
       'vr_platform_specific_chromium_gtests',
+      'weblayer_gtests',
     ],
 
     # gl_tests requires dedicated slaves with GPUs on linux, so have a separate
@@ -4807,12 +4811,16 @@
       'chromium_gtests',
       'chromium_gtests_for_devices_with_graphical_output',
       'chromium_gtests_for_linux_and_chromeos_only',
+      'chromium_gtests_for_linux_and_mac_only',
+      'chromium_gtests_for_linux_only',
       'chromium_gtests_for_win_and_linux_only',
-      'gl_gtests_validating',
       'linux_flavor_specific_chromium_gtests',
+      'linux_specific_xr_gtests',
+      'gl_gtests_validating',
       'non_android_and_cast_and_chromeos_chromium_gtests',
       'non_android_chromium_gtests',
       'vr_platform_specific_chromium_gtests',
+      'weblayer_gtests',
     ],
 
     'chromium_linux_cast_audio_gtests': [
@@ -4834,6 +4842,8 @@
       'telemetry_perf_unittests_isolated_scripts',
     ],
 
+    # When changing something here, change chromium_linux_and_gl_gtests and
+    # chromium_linux_and_gl_and_vulkan_gtests in the same way.
     'chromium_linux_gtests': [
       'aura_gtests',
       'chromium_gtests',