Remove some test suppressions where it is not clear why they exist.

Bug: 843511
Change-Id: I946798560e0ba54d22123d86c90507e0d9c9c7da
Reviewed-on: https://chromium-review.googlesource.com/1099430
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567254}
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 035c3a3..2092b67 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -292,6 +292,18 @@
       },
       {
         "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "boringssl_crypto_tests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "boringssl_ssl_tests"
+      },
+      {
+        "swarming": {
           "can_use_on_swarming_builders": true,
           "shards": 20
         },
@@ -410,6 +422,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "google_apis_unittests"
       },
       {
@@ -421,7 +439,7 @@
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "shards": 3
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -553,6 +571,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "service_manager_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "services_unittests"
       },
       {
@@ -732,6 +756,18 @@
       },
       {
         "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "boringssl_crypto_tests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "boringssl_ssl_tests"
+      },
+      {
+        "swarming": {
           "can_use_on_swarming_builders": true,
           "shards": 10
         },
@@ -911,6 +947,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gl_unittests_ozone"
       },
       {
@@ -928,7 +970,7 @@
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "shards": 3
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -1098,6 +1140,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "service_manager_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "services_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.clang.json b/testing/buildbot/chromium.clang.json
index 3fa5a15..9a8b955 100644
--- a/testing/buildbot/chromium.clang.json
+++ b/testing/buildbot/chromium.clang.json
@@ -420,7 +420,8 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": true
+          "can_use_on_swarming_builders": true,
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index b74cd70..86e41fd 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -543,6 +543,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "google_apis_unittests"
       },
       {
@@ -620,6 +626,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -632,6 +644,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "nacl_loader_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "native_theme_unittests"
       },
       {
@@ -2622,6 +2640,18 @@
             }
           ]
         },
+        "test": "latency_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_type": "coho",
+              "os": "Android"
+            }
+          ]
+        },
         "test": "libjingle_xmpp_unittests"
       },
       {
@@ -3222,6 +3252,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "google_apis_unittests"
       },
       {
@@ -3286,6 +3322,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "latency_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "leveldb_service_unittests"
       },
       {
@@ -3753,6 +3795,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "google_apis_unittests"
       },
       {
@@ -3775,7 +3823,8 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": true
+          "can_use_on_swarming_builders": true,
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -3829,6 +3878,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -3841,6 +3896,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "nacl_loader_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "native_theme_unittests"
       },
       {
@@ -7340,6 +7401,15 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "display_unittests"
+      },
+      {
+        "args": [
+          "--enable-features=ViewsBrowserWindows"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "extensions_unittests"
       },
       {
@@ -7367,6 +7437,15 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "args": [
+          "--enable-features=ViewsBrowserWindows"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "google_apis_unittests"
       },
       {
@@ -7477,6 +7556,15 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "args": [
+          "--enable-features=ViewsBrowserWindows"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -7495,6 +7583,15 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "nacl_loader_unittests"
+      },
+      {
+        "args": [
+          "--enable-features=ViewsBrowserWindows"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "native_theme_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index e88f942..0543823 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -134,6 +134,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "google_apis_unittests"
       },
       {
@@ -391,6 +397,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "google_apis_unittests"
       },
       {
@@ -1103,7 +1115,8 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": true
+          "can_use_on_swarming_builders": true,
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -1180,6 +1193,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -1940,7 +1959,7 @@
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "shards": 3
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -1981,6 +2000,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "latency_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "leveldb_service_unittests"
       },
       {
@@ -2011,6 +2036,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -2550,6 +2581,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gn_unittests"
       },
       {
@@ -2567,7 +2604,7 @@
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
-          "shards": 3
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -2598,6 +2635,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "latency_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "leveldb_service_unittests"
       },
       {
@@ -2628,6 +2671,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -2680,6 +2729,12 @@
         "test": "printing_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "remoting_unittests"
+      },
+      {
         "args": [
           "--test-launcher-print-test-stdio=always"
         ],
@@ -2692,6 +2747,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "service_manager_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "services_unittests"
       },
       {
@@ -2758,6 +2819,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "views_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "viz_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 45195db..e240c16a 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -193,6 +193,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gn_unittests"
       },
       {
@@ -221,7 +227,8 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": false
+          "can_use_on_swarming_builders": true,
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -271,6 +278,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -331,6 +344,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "service_manager_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "services_unittests"
       },
       {
@@ -695,6 +714,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gn_unittests"
       },
       {
@@ -711,7 +736,8 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": true
+          "can_use_on_swarming_builders": true,
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -761,6 +787,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -821,6 +853,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "service_manager_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "services_unittests"
       },
       {
@@ -1046,6 +1084,18 @@
         "test": "blink_platform_unittests"
       },
       {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "boringssl_crypto_tests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "boringssl_ssl_tests"
+      },
+      {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/mac_window_server_killers.browser_tests.filter"
         ],
@@ -1173,6 +1223,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gn_unittests"
       },
       {
@@ -1201,7 +1257,8 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": true
+          "can_use_on_swarming_builders": true,
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -1251,6 +1308,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -1311,6 +1374,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "service_manager_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "services_unittests"
       },
       {
@@ -1677,6 +1746,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gn_unittests"
       },
       {
@@ -1756,6 +1831,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -1816,6 +1897,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "service_manager_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "services_unittests"
       },
       {
@@ -2180,6 +2267,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gn_unittests"
       },
       {
@@ -2259,6 +2352,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
@@ -2319,6 +2418,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "service_manager_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "services_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 2419f84..31cce3a 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -3318,6 +3318,16 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "sync_integration_tests"
+      },
+      {
+        "args": [
+          "--test-launcher-batch-limit=1",
+          "--test-launcher-print-test-stdio=always"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "traffic_annotation_auditor_unittests"
       },
       {
@@ -3785,7 +3795,8 @@
       },
       {
         "swarming": {
-          "can_use_on_swarming_builders": true
+          "can_use_on_swarming_builders": true,
+          "shards": 2
         },
         "test": "interactive_ui_tests"
       },
@@ -3955,6 +3966,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "sync_integration_tests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "traffic_annotation_auditor_unittests"
       },
       {
@@ -4452,6 +4469,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "sync_integration_tests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "ui_base_unittests"
       },
       {
@@ -4941,6 +4964,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "sync_integration_tests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "ui_base_unittests"
       },
       {
@@ -5462,6 +5491,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "sync_integration_tests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "traffic_annotation_auditor_unittests"
       },
       {
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 2b0cb40..7c01878 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -265,6 +265,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gn_unittests"
       },
       {
@@ -946,6 +952,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gn_unittests"
       },
       {
@@ -2796,6 +2808,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "display_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "elevation_service_unittests"
       },
       {
@@ -2832,6 +2850,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "gin_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "gn_unittests"
       },
       {
@@ -2928,6 +2952,12 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
+        "test": "message_center_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
         "test": "midi_unittests"
       },
       {
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index f85b8aa3..a5048fe 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -170,24 +170,6 @@
       },
     },
   },
-  'boringssl_crypto_tests': {
-    'remove_from': [
-      # chromium.chromiumos
-      'linux-chromeos-dbg',
-      'linux-chromeos-rel',
-      # On chromium.mac, unclear why these aren't run on "Mac10.12 Tests".
-      'Mac10.12 Tests',
-    ],
-  },
-  'boringssl_ssl_tests': {
-    'remove_from': [
-      # chromium.chromiumos
-      'linux-chromeos-dbg',
-      'linux-chromeos-rel',
-      # On chromium.mac, unclear why these aren't run on "Mac10.12 Tests".
-      'Mac10.12 Tests',
-    ],
-  },
   'breakpad_unittests': {
     'modifications': {
       'KitKat Tablet Tester': {
@@ -1125,14 +1107,6 @@
       'Linux - Future (dbg)',
     ],
   },
-  'display_unittests': {
-    'remove_from': [
-      # chromium.fyi, unclear why these aren't run.
-      'mac-views-rel',
-      # chromium.win
-      'Win7 Tests (dbg)(1)',
-    ],
-  },
   'events_unittests': {
     'modifications': {
       'KitKat Tablet Tester': {
@@ -1180,33 +1154,11 @@
   },
   'gin_unittests': {
     'remove_from': [
-      # chromium.chromiumos
-      'linux-chromeos-dbg',
-      'linux-chromeos-rel',
       # chromium.clang
       'ToTLinuxASan',  # https://crbug.com/831667
-      # chromium.fyi
-      'mac-views-rel',
-      'Chromium Mac 10.13',
-      'Out of Process Profiling Linux',
-      'Out of Process Profiling Mac',
-      # On chromium.linux, unclear why these aren't run on Cast.
-      'Cast Audio Linux',
-      'Cast Linux',
-      'Linux Tests (dbg)(1)(32)',
-      # On chromium.mac, unclear why these aren't run.
-      'Mac10.10 Tests',
-      'Mac10.11 Tests',
-      'Mac10.12 Tests',
-      'Mac10.13 Tests',
-      'Mac10.13 Tests (dbg)',
       # chromium.memory
       'Linux ASan LSan Tests (1)',  # https://crbug.com/831667
       'Linux Chromium OS ASan LSan Tests (1)',  # https://crbug.com/831667
-      # On chromium.win, unclear why these only run on "Win7 Tests (1)".
-      'Win 7 Tests x64 (1)',
-      'Win10 Tests x64',
-      'Win7 Tests (dbg)(1)',
       # client.v8.chromium
       'Linux - Future (dbg)',
     ],
@@ -1457,65 +1409,6 @@
       'Linux TSan Tests',
     ],
     'modifications': {
-      # chromium.clang
-      'CFI Linux (icall)': {
-        'swarming': {
-          'shards': 1,
-        },
-      },
-      # chromium.linux
-      # Unclear why this isn't sharded.
-      'Linux Tests': {
-        'swarming': {
-          'shards': 1,
-        },
-      },
-      'Linux Tests (dbg)(1)': {
-        'swarming': {
-          'shards': 3,
-        },
-      },
-      'Linux Tests (dbg)(1)(32)': {
-        'swarming': {
-          'shards': 3,
-        },
-      },
-      # chromium.chromiumos
-      'linux-chromeos-dbg': {
-        'swarming': {
-          'shards': 3,
-        },
-      },
-      'linux-chromeos-rel': {
-        'swarming': {
-          'shards': 3,
-        },
-      },
-      # chromium.fyi
-      'Out of Process Profiling Mac': {
-        'swarming': {
-          'shards': 1,
-        },
-      },
-      # chromium.mac
-      # Unclear why this isn't swarmed.
-      'Mac10.10 Tests': {
-        'swarming': {
-          'can_use_on_swarming_builders': False,
-        },
-      },
-      # Unclear why this isn't sharded.
-      'Mac10.11 Tests': {
-        'swarming': {
-          'shards': 1,
-        },
-      },
-      # Unclear why this isn't sharded.
-      'Mac10.12 Tests': {
-        'swarming': {
-          'shards': 1,
-        },
-      },
       # chromium.win
       'Win7 Tests (dbg)(1)': {
         'swarming': {
@@ -1530,11 +1423,6 @@
           'shards': 6,
         },
       },
-      'Linux CFI': {
-        'swarming': {
-          'shards': 1,
-        },
-      },
       # client.v8.chromium
       'Linux - Future (dbg)': {
         'swarming': {
@@ -1584,24 +1472,7 @@
       },
     },
   },
-  'keyboard_unittests': {
-    'remove_from': [
-      'Win7 Tests (dbg)(1)',
-      # On chromium.linux, unclear why these aren't run.
-      'Linux Tests',
-      'Linux Tests (dbg)(1)',
-      'Linux Tests (dbg)(1)(32)',
-    ],
-  },
   'latency_unittests': {
-    'remove_from': [
-      # chromium.fyi
-      'Out of Process Profiling Android',
-      'Out of Process Profiling Linux',
-      # On chromium.linux, unclear why these aren't run.
-      'Linux Tests (dbg)(1)',
-      'Linux Tests (dbg)(1)(32)',
-    ],
     'modifications': {
       'KitKat Tablet Tester': {
         'swarming': {
@@ -1656,29 +1527,6 @@
       'Fuchsia ARM64',
     ],
   },
-  'message_center_unittests': {
-    'remove_from': [
-      'Win7 Tests (dbg)(1)',
-      # On chromium.mac, unclear why these aren't run.
-      'Mac10.10 Tests',
-      'Mac10.11 Tests',
-      'Mac10.12 Tests',
-      'Mac10.13 Tests',
-      'Mac10.13 Tests (dbg)',
-
-      # chromium.fyi
-      'mac-views-rel',
-      'Chromium Mac 10.13',
-      'Out of Process Profiling Mac',
-
-      # On chromium.linux, unclear why these aren't run.
-      'Linux Tests',
-
-      # On chromium.linux, unclear why these aren't run.
-      'Linux Tests (dbg)(1)',
-      'Linux Tests (dbg)(1)(32)',
-    ],
-  },
   'metrics_python_tests': {
     'remove_from': [
       # chromium.fyi
@@ -1719,10 +1567,6 @@
   },
   'nacl_loader_unittests': {
     'remove_from': [
-      # chromium.fyi
-      'mac-views-rel',
-      'Chromium Mac 10.13',
-      'Out of Process Profiling Mac',
       # chromium.clang
       'ToTMacASan',  # The mac asan tot bot sets enable_nacl=false
       'linux-win_cross-rel',  # Sets enable_nacl=false, https://crbug.com/774186
@@ -1851,12 +1695,6 @@
       'linux-chromeos-dbg',
     ],
   },
-  'remoting_unittests': {
-    'remove_from': [
-      # On chromium.linux, unclear why these aren't run on 32-bit.
-      'Linux Tests (dbg)(1)(32)',
-    ],
-  },
   'sandbox_linux_unittests': {
     'modifications': {
       'KitKat Tablet Tester': {
@@ -1896,21 +1734,6 @@
       },
     },
   },
-  'service_manager_unittests': {
-    'remove_from': [
-      # chromium.chromiumos
-      'linux-chromeos-dbg',
-      'linux-chromeos-rel',
-      # chromium.linux
-      'Linux Tests (dbg)(1)(32)',
-      # On chromium.mac, unclear why these aren't run.
-      'Mac10.10 Tests',
-      'Mac10.11 Tests',
-      'Mac10.12 Tests',
-      'Mac10.13 Tests',
-      'Mac10.13 Tests (dbg)',
-    ],
-  },
   'services_unittests': {
     'remove_from': [
       # chromium.clang
@@ -2143,12 +1966,7 @@
     },
     'remove_from': [
       # chromium.memory
-      'Linux ASan LSan Tests (1)',
-      'Linux CFI',
-      'Linux Chromium OS ASan LSan Tests (1)',
-      'Linux ChromiumOS MSan Tests',
-      'Linux MSan Tests',
-      'Linux TSan Tests',
+      'Linux TSan Tests',  # https://crbug.com/852002
     ],
   },
   'performance_test_suite': {
@@ -2466,12 +2284,6 @@
       'Win10 FYI Exp Release (Intel HD 630)',
     ],
   },
-  'views_unittests': {
-    'remove_from': [
-      # chromium.linux
-      'Linux Tests (dbg)(1)(32)',
-    ],
-  },
   'viz_content_browsertests': {
     'remove_from': [
       # Currently flaky timeouts on Windows 10. crbug.com/839824