Update from https://crrev.com/312398

testing/buildbot/chromium_trybot.json

Index: testing/buildbot/chromium_trybot.json
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index cdf0ea1ac1ec23b928aeecdd12e51d30ed5445a5..eef261934b84f33083c324bfa08293b709282c5e 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -67,7 +67,12 @@
       "platforms": ["win"]
     },
     "components_browsertests",
-    "components_unittests",
+    {
+      "test": "components_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "compositor_unittests",
       "platforms": ["linux", "win"]
@@ -112,7 +117,12 @@
       }
     },
     "google_apis_unittests",
-    "gpu_unittests",
+    {
+      "test": "gpu_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "interactive_ui_tests",
       "swarming": {
@@ -135,7 +145,12 @@
       "platforms": ["linux", "win"]
     },
     "media_perftests",
-    "media_unittests",
+    {
+      "test": "media_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "message_center_unittests",
       "swarming": {
@@ -251,15 +266,6 @@
       ]
     },
     {
-      "test": "athena_unittests",
-      "platforms": ["linux"],
-      "chromium_configs": [
-        "chromium_chromeos",
-        "chromium_chromeos_athena",
-        "chromium_chromeos_ozone"
-      ]
-    },
-    {
       "test": "display_unittests",
       "platforms": ["linux"]
     },