[mac][infra] Align 'Mac10.15 Tests' with 'Mac10.13 Tests'

The test configs in `testing/buildbot/chromium.mac.json` are now the
same between these 2 builders. This is a preparation to make 'mac-rel'
mirror 'Mac10.15 Tests' instead of 'Mac10.13 Tests' for correct naming.

Bug: 1171053
Change-Id: I8125c402e332a3584ce2aefef3ba1dccde735364
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2707314
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Reviewed-by: Lindsay Pasricha <lindsayw@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#855927}

testing/buildbot/chromium.mac.json

@@ -8802,25 +8802,6 @@
         "test": "boringssl_ssl_tests",
         "test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
       },
-      {
-        "isolate_profile_data": true,
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.15"
-            }
-          ],
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 10
-        },
-        "test": "browser_tests",
-        "test_id_prefix": "ninja://chrome/test:browser_tests/"
-      },
       {
         "args": [
           "--gtest_filter=-*UsingRealWebcam*"
@@ -9822,6 +9803,9 @@
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
+        "precommit_args": [
+          "--gtest_filter=-*"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -10064,7 +10048,7 @@
             }
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 12
+          "shards": 25
         },
         "test_id_prefix": "ninja://:blink_web_tests/"
       },
@@ -10290,33 +10274,6 @@
         },
         "test_id_prefix": "ninja://chrome/test:telemetry_gpu_unittests/"
       },
-      {
-        "args": [
-          "--extra-browser-args=--enable-crashpad"
-        ],
-        "isolate_name": "telemetry_perf_unittests",
-        "isolate_profile_data": true,
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "telemetry_perf_unittests",
-        "resultdb": {
-          "enable": true
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Mac-10.15"
-            }
-          ],
-          "idempotent": false,
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 12
-        },
-        "test_id_prefix": "ninja://chrome/test:telemetry_perf_unittests/"
-      },
       {
         "args": [
           "--jobs=1",

testing/buildbot/test_suite_exceptions.pyl

@@ -230,6 +230,16 @@
           'shards': 25,
         },
       },
+      'Mac10.15 Tests': {
+        'swarming': {
+          'dimension_sets': [
+            {
+              'gpu': None,
+            },
+          ],
+          'shards': 25,
+        },
+      },
       'V8 Blink Linux Debug': {
         # This builder compiles Chromium in release mode, but V8 in debug.
         # TODO(machenbach): Change name and out directory of this builder to
@@ -442,7 +452,10 @@
       'CrWinAsan(dll)', # https://crbug.com/935598
       'linux-win_cross-rel',
       'ToTLinuxTSan',  # https://crbug.com/368525
+      # TODO(crbug.com/1171053): Enable the suite in 'Mac10.13 Tests' once it's
+      # off CQ.
       'Mac10.13 Tests', # https://crbug.com/1042757
+      'Mac10.15 Tests', # https://crbug.com/1042757
       'Linux TSan Tests',  # https://crbug.com/368525
       'Win10 Tests x64 (dbg)',
     ],
@@ -1883,6 +1896,7 @@
       'Mac10.11 Tests',
       'Mac10.13 Tests',
       'Mac10.13 Tests (dbg)',
+      'Mac10.15 Tests',
       'Mac ASan 64 Tests (1)',
       'ToTMacASan',
     ],
@@ -1918,6 +1932,7 @@
       'Mac10.11 Tests',
       'Mac10.13 Tests',
       'Mac10.13 Tests (dbg)',
+      'Mac10.15 Tests',
       'Mac ASan 64 Tests (1)',
       'ToTMacASan',
     ],
@@ -1934,6 +1949,7 @@
       'Mac10.11 Tests',
       'Mac10.13 Tests',
       'Mac10.13 Tests (dbg)',
+      'Mac10.15 Tests',
       'Mac ASan 64 Tests (1)',
       'ToTMacASan',
     ],
@@ -1949,6 +1965,7 @@
       'Mac10.11 Tests',
       'Mac10.13 Tests',
       'Mac10.13 Tests (dbg)',
+      'Mac10.15 Tests',
       'Mac ASan 64 Tests (1)',
       'ToTMacASan',
     ],
@@ -1969,6 +1986,7 @@
       'Mac10.11 Tests',
       'Mac10.13 Tests',
       'Mac10.13 Tests (dbg)',
+      'Mac10.15 Tests',
       'Mac ASan 64 Tests (1)',
       'ToTMacASan',
     ],
@@ -2343,6 +2361,12 @@
             '--gtest_filter=-*',
           ],
       },
+      # TODO(crbug.com/1131588) Tests are flaky only on CQ.
+      'Mac10.15 Tests': {
+        'precommit_args': [
+            '--gtest_filter=-*',
+          ],
+      },
       'ToTLinuxTSan': {
         'swarming': {
           'shards': 6,
@@ -2467,6 +2491,7 @@
       'Mac10.11 Tests',
       'Mac10.13 Tests',
       'Mac10.13 Tests (dbg)',
+      'Mac10.15 Tests',
       'Linux - Future (dbg)',  # client.v8.chromium
       'Win10 Tests x64',
       'Win10 Tests x64 (dbg)',