Update from https://crrev.com/308996

testing/buildbot/chromium.chromiumos.json

Index: testing/buildbot/chromium.chromiumos.json
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index ed51c034cd1a32448a9be89afc5a91c1b7636308..62ecaa06e38b57dcd000cdb835791f62837104f6 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -106,7 +106,13 @@
       "chromeos_unittests",
       "chromevox_tests",
       "components_unittests",
-      "content_browsertests",
+      {
+        "test": "content_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 2
+        }
+      },
       "content_unittests",
       "crypto_unittests",
       "dbus_unittests",
@@ -117,13 +123,24 @@
       "gcm_unit_tests",
       "google_apis_unittests",
       "gpu_unittests",
-      "interactive_ui_tests",
+      {
+        "test": "interactive_ui_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 3
+        }
+      },
       "ipc_tests",
       "jingle_unittests",
       "media_unittests",
       "message_center_unittests",
       "nacl_loader_unittests",
-      "net_unittests",
+      {
+        "test": "net_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "ozone_unittests",
       "ppapi_unittests",
       "printing_unittests",
@@ -137,17 +154,17 @@
       "ui_base_unittests",
       "ui_chromeos_unittests",
       "ui_touch_selection_unittests",
-      "unit_tests",
+      {
+        "test": "unit_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "url_unittests",
       "views_unittests",
       "wm_unittests"
     ]
   },
-  "Linux ChromiumOS Ozone Tests (2)": {
-    "gtest_tests": [
-      "browser_tests"
-    ]
-  },
   "Linux ChromiumOS Tests (dbg)(1)": {
     "gtest_tests": [
       "accessibility_unittests",