Update from https://crrev.com/312398

testing/buildbot/chromium_memory_trybot.json

Index: testing/buildbot/chromium_memory_trybot.json
diff --git a/testing/buildbot/chromium_memory_trybot.json b/testing/buildbot/chromium_memory_trybot.json
index 2b8564e164ca1775ab355f0ca9e45de16a5d6920..af0f169b0223f7a42c9366fea3211c5156da9fde 100644
--- a/testing/buildbot/chromium_memory_trybot.json
+++ b/testing/buildbot/chromium_memory_trybot.json
@@ -16,7 +16,12 @@
     },
     "cacheinvalidation_unittests",
     "cc_unittests",
-    "components_unittests",
+    {
+      "test": "components_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "content_browsertests",
       "swarming": {
@@ -39,7 +44,12 @@
     "gcm_unit_tests",
     "gfx_unittests",
     "google_apis_unittests",
-    "gpu_unittests",
+    {
+      "test": "gpu_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "interactive_ui_tests",
       "swarming": {
@@ -49,13 +59,19 @@
     },
     "ipc_tests",
     "jingle_unittests",
-    "media_unittests",
     {
-      "test": "net_unittests",
+      "test": "media_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
       }
     },
+    {
+      "test": "net_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true,
+        "shards": 2
+      }
+    },
     "ppapi_unittests",
     "printing_unittests",
     "remoting_unittests",