Revert of CrWinClang: Swarm content_unittests, net_unittests, unit_tests, browser_tests.

testing/buildbot/chromium.fyi.json

Index: testing/buildbot/chromium.fyi.json
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index c7ae7dc3d071612ba1ec46b38b28df9cda495f22..5337306c0c4a86fea4cd060590e9e0681cbc7dfb 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -379,20 +379,10 @@
       "gpu_unittests",
       "url_unittests",
       "jingle_unittests",
-      {
-        "test": "content_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
-      "device_unittests",
-      "media_unittests",
-      {
-        "test": "net_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
+      "content_unittests",
+      "device_unittests",
+      "media_unittests",
+      "net_unittests",
       "ppapi_unittests",
       "printing_unittests",
       "remoting_unittests",
@@ -402,23 +392,12 @@
       "ipc_tests",
       "sync_unit_tests",
       "skia_unittests",
-      {
-        "test": "unit_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        }
-      },
-      "sql_unittests",
-      "ui_base_unittests",
-      "content_unittests",
-      "views_unittests",
-      {
-        "test": "browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 10
-        }
-      },
+      "unit_tests",
+      "sql_unittests",
+      "ui_base_unittests",
+      "content_unittests",
+      "views_unittests",
+      "browser_tests",
       {
         "test": "content_browsertests",
         "swarming": {