Update from https://crrev.com/328418

testing/buildbot/chromium.perf.json

Index: testing/buildbot/chromium.perf.json
diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json
index f3ad4cae7b0e0bea8e35beab8d78f3924776b87a..3c71c4d21434de86c4b71316d516ec3cb4cd3dad 100644
--- a/testing/buildbot/chromium.perf.json
+++ b/testing/buildbot/chromium.perf.json
@@ -240,6 +240,15 @@
     "scripts": [
       {
         "args": [
+          "angle_perftests",
+          "--test-launcher-print-test-stdio=always",
+          "--test-launcher-jobs=1"
+        ],
+        "name": "angle_perftests",
+        "script": "gtest_perf_test.py"
+      },
+      {
+        "args": [
           "performance_browser_tests",
           "--test-launcher-print-test-stdio=always",
           "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
@@ -255,6 +264,15 @@
     "scripts": [
       {
         "args": [
+          "angle_perftests",
+          "--test-launcher-print-test-stdio=always",
+          "--test-launcher-jobs=1"
+        ],
+        "name": "angle_perftests",
+        "script": "gtest_perf_test.py"
+      },
+      {
+        "args": [
           "performance_browser_tests",
           "--test-launcher-print-test-stdio=always",
           "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
@@ -287,7 +305,6 @@
         "args": [
           "angle_perftests",
           "--test-launcher-print-test-stdio=always",
-          "--gtest_filter=DrawCallPerf*",
           "--test-launcher-jobs=1"
         ],
         "name": "angle_perftests",
@@ -337,18 +354,6 @@
     ]
   },
   "Win 8 Perf (2)": {
-    "scripts": [
-      {
-        "args": [
-          "performance_browser_tests",
-          "--test-launcher-print-test-stdio=always",
-          "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*",
-          "--test-launcher-jobs=1",
-          "--enable-gpu"
-        ],
-        "name": "performance_browser_tests",
-        "script": "gtest_perf_test.py"
-      }
-    ]
+    "scripts": []
   }
 }