Update from https://crrev.com/327068

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 065de534c662c9325a77e7712a584b3527685674..d42d5516c3f7b42aa06d15b40d2ac112d9de83d7 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -2,25 +2,32 @@
   "compile_targets": [
     "all"
   ],
+  "filter_compile_builders": [
+    "win_chromium_compile_dbg",
+    "win_chromium_rel_swarming",
+    "win_chromium_x64_rel_swarming",
+    "win8_chromium_rel"
+  ],
   "gtest_tests": [
     {
-      "test": "accessibility_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "accessibility_unittests"
     },
     {
-      "test": "app_installer_unittests",
-      "platforms": ["win"]
+      "platforms": [
+        "win"
+      ],
+      "test": "app_installer_unittests"
     },
     {
-      "test": "app_list_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "app_list_unittests"
     },
     {
-      "test": "ash_unittests",
       "chromium_configs": [
         "chromium_chromeos",
         "chromium_chromeos_clang",
@@ -28,155 +35,183 @@
       ],
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "ash_unittests"
     },
     {
-      "test": "ash_unittests",
-      "platforms": ["win"],
+      "platforms": [
+        "win"
+      ],
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "ash_unittests"
     },
     {
-      "test": "base_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "base_unittests"
     },
     {
-      "test": "browser_tests",
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 8
-      }
+      },
+      "test": "browser_tests"
     },
     "cacheinvalidation_unittests",
     {
-      "test": "cast_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "cast_unittests"
     },
     {
-      "test": "cc_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "cc_unittests"
     },
     "chromedriver_unittests",
     {
-      "test": "chromevox_tests",
       "chromium_configs": [
         "chromium_chromeos",
         "chromium_chromeos_clang",
         "chromium_chromeos_ozone"
-      ]
+      ],
+      "test": "chromevox_tests"
     },
     {
-      "test": "chrome_elf_unittests",
-      "platforms": ["win"]
+      "platforms": [
+        "win"
+      ],
+      "test": "chrome_elf_unittests"
     },
     {
-      "test": "components_browsertests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "components_browsertests"
     },
     {
-      "test": "components_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "components_unittests"
     },
     {
-      "test": "compositor_unittests",
-      "platforms": ["linux", "win"]
+      "platforms": [
+        "linux",
+        "win"
+      ],
+      "test": "compositor_unittests"
     },
     {
-      "test": "courgette_unittests",
       "can_use_on_swarming_builders": true,
-      "platforms": ["win"]
+      "platforms": [
+        "win"
+      ],
+      "test": "courgette_unittests"
     },
     {
-      "test": "content_browsertests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "content_browsertests"
     },
     {
-      "test": "content_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "content_unittests"
     },
     {
-      "test": "crypto_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "crypto_unittests"
     },
     {
-      "test": "dbus_unittests",
-      "platforms": ["linux"]
+      "platforms": [
+        "linux"
+      ],
+      "test": "dbus_unittests"
     },
     "device_unittests",
     {
-      "test": "events_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "events_unittests"
     },
     {
-      "test": "extensions_unittests",
-      "platforms": ["win", "mac", "linux"]
+      "platforms": [
+        "win",
+        "mac",
+        "linux"
+      ],
+      "test": "extensions_unittests"
     },
     "gcm_unit_tests",
     {
-      "test": "gfx_unittests",
+      "chromium_configs": [
+        "chromium_chromeos",
+        "chromium_chromeos_clang",
+        "chromium_chromeos_ozone"
+      ],
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "gfx_unittests"
     },
     "google_apis_unittests",
     {
-      "test": "gpu_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "gpu_unittests"
     },
     {
-      "test": "interactive_ui_tests",
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 3
-      }
+      },
+      "test": "interactive_ui_tests"
     },
     {
-      "test": "installer_util_unittests",
-      "platforms": ["win"]
+      "platforms": [
+        "win"
+      ],
+      "test": "installer_util_unittests"
     },
     {
-      "test": "ipc_mojo_unittests",
-      "platforms": ["linux"]
+      "platforms": [
+        "linux"
+      ],
+      "test": "ipc_mojo_unittests"
     },
     "ipc_tests",
     "jingle_unittests",
     {
-      "test": "keyboard_unittests",
-      "platforms": ["linux", "win"]
+      "platforms": [
+        "linux",
+        "win"
+      ],
+      "test": "keyboard_unittests"
     },
     "media_perftests",
     {
-      "test": "media_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "media_unittests"
     },
     {
-      "test": "message_center_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "message_center_unittests"
     },
     "mojo_common_unittests",
     "mojo_public_bindings_unittests",
@@ -186,127 +221,153 @@
     "mojo_system_unittests",
     "nacl_loader_unittests",
     {
-      "test": "net_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "net_unittests"
     },
     "ppapi_unittests",
     "printing_unittests",
     "remoting_unittests",
     {
-      "test": "sbox_integration_tests",
-      "platforms": ["win"]
+      "platforms": [
+        "win"
+      ],
+      "test": "sbox_integration_tests"
     },
     {
-      "test": "sbox_validation_tests",
-      "platforms": ["win"]
+      "platforms": [
+        "win"
+      ],
+      "test": "sbox_validation_tests"
     },
     {
-      "test": "sbox_unittests",
-      "platforms": ["win"]
+      "platforms": [
+        "win"
+      ],
+      "test": "sbox_unittests"
     },
     "sql_unittests",
     {
-      "test": "sync_integration_tests",
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 3
-      }
+      },
+      "test": "sync_integration_tests"
     },
     "sync_unit_tests",
     {
-      "test": "ui_base_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "ui_base_unittests"
     },
     {
-      "test": "ui_touch_selection_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "ui_touch_selection_unittests"
     },
     {
-      "test": "unit_tests",
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 2
-      }
+      },
+      "test": "unit_tests"
     },
     {
-      "test": "ui_chromeos_unittests",
-      "platforms": ["linux"],
       "chromium_configs": [
         "chromium_chromeos",
         "chromium_chromeos_clang",
         "chromium_chromeos_ozone"
-      ]
+      ],
+      "platforms": [
+        "linux"
+      ],
+      "test": "ui_chromeos_unittests"
     },
     "url_unittests",
     "skia_unittests",
     {
-      "test": "wm_unittests",
-      "platforms": ["linux", "win"]
+      "platforms": [
+        "linux",
+        "win"
+      ],
+      "test": "wm_unittests"
     },
     {
-      "test": "extensions_browsertests",
-      "platforms": ["linux", "win"],
+      "platforms": [
+        "linux",
+        "win"
+      ],
       "swarming": {
         "can_use_on_swarming_builders": true
-      }
+      },
+      "test": "extensions_browsertests"
     },
     {
-      "test": "app_shell_unittests",
-      "platforms": ["linux", "win"]
+      "platforms": [
+        "linux",
+        "win"
+      ],
+      "test": "app_shell_unittests"
     },
     {
-      "test": "aura_unittests",
-      "platforms": ["linux", "win"]
+      "platforms": [
+        "linux",
+        "win"
+      ],
+      "test": "aura_unittests"
     },
     {
-      "test": "views_unittests",
-      "platforms": ["linux", "win"]
+      "platforms": [
+        "linux",
+        "win"
+      ],
+      "test": "views_unittests"
     },
     {
-      "test": "sandbox_linux_unittests",
-      "platforms": ["linux"],
-      "args": ["--test-launcher-print-test-stdio=always"]
+      "args": [
+        "--test-launcher-print-test-stdio=always"
+      ],
+      "platforms": [
+        "linux"
+      ],
+      "test": "sandbox_linux_unittests"
     },
     {
-      "test": "sandbox_mac_unittests",
-      "platforms": ["mac"]
+      "platforms": [
+        "mac"
+      ],
+      "test": "sandbox_mac_unittests"
     },
     {
-      "test": "chromeos_unittests",
-      "platforms": ["linux"],
       "chromium_configs": [
         "chromium_chromeos",
         "chromium_chromeos_clang",
         "chromium_chromeos_ozone"
-      ]
+      ],
+      "platforms": [
+        "linux"
+      ],
+      "test": "chromeos_unittests"
     },
     {
-      "test": "display_unittests",
-      "platforms": ["linux"]
+      "platforms": [
+        "linux"
+      ],
+      "test": "display_unittests"
     },
     {
-      "test": "ozone_unittests",
-      "platforms": ["linux"],
-      "chromium_configs": ["chromium_chromeos_ozone"]
+      "chromium_configs": [
+        "chromium_chromeos_ozone"
+      ],
+      "platforms": [
+        "linux"
+      ],
+      "test": "ozone_unittests"
     }
   ],
-
-  "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"
-  ]
+  "non_filter_builders": [],
+  "non_filter_tests_builders": []
 }