Update from https://crrev.com/312398

testing/buildbot/chromium_trybot.json

 {
   "compile_targets": [
     "all"
   ],
   "gtest_tests": [
     {
       "test": "accessibility_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
       }
@@ skipping 49 matching lines @@
         "chromium_chromeos",
         "chromium_chromeos_clang",
         "chromium_chromeos_ozone"
       ]
     },
     {
       "test": "chrome_elf_unittests",
       "platforms": ["win"]
     },
     "components_browsertests",
-    "components_unittests",
+    {
+      "test": "components_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "compositor_unittests",
       "platforms": ["linux", "win"]
     },
     {
       "test": "courgette_unittests",
       "platforms": ["win"]
     },
     {
       "test": "content_browsertests",
@@ skipping 24 matching lines @@
       "platforms": ["win", "mac", "linux"]
     },
     "gcm_unit_tests",
     {
       "test": "gfx_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
       }
     },
     "google_apis_unittests",
-    "gpu_unittests",
+    {
+      "test": "gpu_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "interactive_ui_tests",
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 3
       }
     },
     {
       "test": "installer_util_unittests",
       "platforms": ["win"]
     },
     {
       "test": "ipc_mojo_unittests",
       "platforms": ["linux"]
     },
     "ipc_tests",
     "jingle_unittests",
     {
       "test": "keyboard_unittests",
       "platforms": ["linux", "win"]
     },
     "media_perftests",
-    "media_unittests",
+    {
+      "test": "media_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "message_center_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
       }
     },
     "mojo_common_unittests",
     "mojo_public_bindings_unittests",
     "mojo_public_environment_unittests",
     "mojo_public_system_unittests",
@@ skipping 95 matching lines @@
     {
       "test": "chromeos_unittests",
       "platforms": ["linux"],
       "chromium_configs": [
         "chromium_chromeos",
         "chromium_chromeos_clang",
         "chromium_chromeos_ozone"
       ]
     },
     {
-      "test": "athena_unittests",
-      "platforms": ["linux"],
-      "chromium_configs": [
-        "chromium_chromeos",
-        "chromium_chromeos_athena",
-        "chromium_chromeos_ozone"
-      ]
-    },
-    {
       "test": "display_unittests",
       "platforms": ["linux"]
     },
     {
       "test": "ozone_unittests",
       "platforms": ["linux"],
       "chromium_configs": ["chromium_chromeos_ozone"]
     }
   ],
 
   "non_filter_builders": [
   ],
 
   "non_filter_tests_builders": [
   ],
 
   "filter_compile_builders": [
     "win_chromium_compile_dbg",
     "win_chromium_rel_swarming",
     "win_chromium_x64_rel_swarming",
     "win8_chromium_rel"
   ]
 }