Clean up chromium_memory_trybot.json

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 619994dd0c8e878e56ba69c94da3d8164f286508..30bacda0bc238aa8de118c7518212ea59482f0b1 100644
--- a/testing/buildbot/chromium_memory_trybot.json
+++ b/testing/buildbot/chromium_memory_trybot.json
@@ -1,145 +1,71 @@
 {
   "gtest_tests": [
-    {
-      "test": "accessibility_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
+    "accessibility_unittests",
     {
       "test": "base_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"],
       "swarming": {
         "can_use_on_swarming_builders": true
       }
     },
     {
       "test": "browser_tests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_asan"],
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 10
       }
     },
-    {
-      "test": "cacheinvalidation_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "cc_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "components_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "content_browsertests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_asan"]
-    },
-    {
-      "test": "content_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "crypto_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "device_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
+    "cacheinvalidation_unittests",
+    "cc_unittests",
+    "components_unittests",
+    "content_browsertests",
+    "content_unittests",

[jam, 2014/09/25 17:11:04]

nit: please swarm these two content tests

+    "crypto_unittests",
+    "device_unittests",
     {
       "test": "display_unittests",
-      "platforms": ["linux"],
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
+      "platforms": ["linux"]
     },
     {
       "test": "extensions_unittests",
-      "platforms": ["linux", "win", "mac"],
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "gcm_unit_tests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "gfx_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "google_apis_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "gpu_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
+      "platforms": ["linux", "win", "mac"]
     },
+    "gcm_unit_tests",
+    "gfx_unittests",
+    "google_apis_unittests",
+    "gpu_unittests",
     {
       "test": "interactive_ui_tests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_asan"],
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 3
       }
     },
-    {
-      "test": "ipc_tests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "jingle_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "media_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
+    "ipc_tests",
+    "jingle_unittests",
+    "media_unittests",
     {
       "test": "net_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"],
       "swarming": {
         "can_use_on_swarming_builders": true
       }
     },
-    {
-      "test": "ppapi_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "printing_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "remoting_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
+    "ppapi_unittests",
+    "printing_unittests",
+    "remoting_unittests",
     {
       "test": "sandbox_linux_unittests",
-      "platforms": ["linux"],
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "sql_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "sync_unit_tests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    },
-    {
-      "test": "ui_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
+      "platforms": ["linux"]
     },
+    "sql_unittests",
+    "sync_unit_tests",
+    "ui_unittests",
     {
       "test": "unit_tests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"],
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 2
       }
     },
-    {
-      "test": "url_unittests",
-      "exclude_builders": ["tryserver.chromium.linux:linux_browser_asan"]
-    }
+    "url_unittests"
   ]
 }