Add gpu and cc perf tests to new fyi tester

testing/buildbot/chromium.perf.fyi.json

Index: testing/buildbot/chromium.perf.fyi.json
diff --git a/testing/buildbot/chromium.perf.fyi.json b/testing/buildbot/chromium.perf.fyi.json
index 1c16aba82f7992854130f063e768c84a7e340084..61ed51bc9a2d9c5c280fae7f2ff6cda8f6f506a4 100644
--- a/testing/buildbot/chromium.perf.fyi.json
+++ b/testing/buildbot/chromium.perf.fyi.json
@@ -1,18 +1,36 @@
 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
-  "AAAAA2 See generate_perf_json.py to make changes": {},
+  "AAAAA2 See //tools/perf/generate_perf_json.py to make changes": {},
+  "Android Galaxy S5 Perf (1)": {
+    "scripts": [
+      {
+        "args": [
+          "cc_perftests"
+        ],
+        "name": "cc_perftests",
+        "script": "gtest_perf_test.py"
+      },
+      {
+        "args": [
+          "gpu_perftests"
+        ],
+        "name": "gpu_perftests",
+        "script": "gtest_perf_test.py"
+      }
+    ]
+  },
   "Win 10 Low-End Perf Tests": {
     "isolated_scripts": [
       {
         "args": [
-          "smoothness.top_25_smooth",
+          "dromaeo.cssqueryjquery",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "smoothness.top_25_smooth",
+        "name": "dromaeo.cssqueryjquery",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -31,7 +49,7 @@
       },
       {
         "args": [
-          "smoothness.top_25_smooth",
+          "dromaeo.cssqueryjquery",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
@@ -39,7 +57,7 @@
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "smoothness.top_25_smooth.reference",
+        "name": "dromaeo.cssqueryjquery.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -58,14 +76,14 @@
       },
       {
         "args": [
-          "sunspider",
+          "page_cycler_v2.intl_hi_ru",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "sunspider",
+        "name": "page_cycler_v2.intl_hi_ru",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -84,7 +102,7 @@
       },
       {
         "args": [
-          "sunspider",
+          "page_cycler_v2.intl_hi_ru",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
@@ -92,7 +110,7 @@
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "sunspider.reference",
+        "name": "page_cycler_v2.intl_hi_ru.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -111,14 +129,14 @@
       },
       {
         "args": [
-          "system_health.webview_startup",
+          "smoothness.top_25_smooth",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "system_health.webview_startup",
+        "name": "smoothness.top_25_smooth",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -129,7 +147,7 @@
               "id": "build187-b4"
             },
             {
-              "id": "build186-b4"
+              "id": "build171-b4"
             }
           ],
           "expiration": 14400
@@ -137,7 +155,7 @@
       },
       {
         "args": [
-          "system_health.webview_startup",
+          "smoothness.top_25_smooth",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
@@ -145,7 +163,7 @@
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "system_health.webview_startup.reference",
+        "name": "smoothness.top_25_smooth.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -156,7 +174,7 @@
               "id": "build187-b4"
             },
             {
-              "id": "build186-b4"
+              "id": "build171-b4"
             }
           ],
           "expiration": 14400
@@ -164,14 +182,14 @@
       },
       {
         "args": [
-          "page_cycler_v2.intl_hi_ru",
+          "sunspider",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "page_cycler_v2.intl_hi_ru",
+        "name": "sunspider",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -182,7 +200,7 @@
               "id": "build187-b4"
             },
             {
-              "id": "build186-b4"

[eyaich1, 2016/10/11 23:05:02]

can you manually change the id on some of these to be build186-b4 that got
switched here?  The current device affinity generator doesn't work correctly
because we aren't using all the benchmarks and we want to split some of the
load.

I have to be honest that I was manually doing changes in these files for
testing, unaware that other people were using it...

[martiniss, 2016/10/11 23:32:02]

done.
Ah ok. I'm starting to use it, because i'm moving some builders over to the
chromium recipe.

+              "id": "build171-b4"
             }
           ],
           "expiration": 14400
@@ -190,7 +208,7 @@
       },
       {
         "args": [
-          "page_cycler_v2.intl_hi_ru",
+          "sunspider",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
@@ -198,7 +216,7 @@
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "page_cycler_v2.intl_hi_ru.reference",
+        "name": "sunspider.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -209,7 +227,7 @@
               "id": "build187-b4"
             },
             {
-              "id": "build186-b4"
+              "id": "build171-b4"
             }
           ],
           "expiration": 14400
@@ -217,14 +235,14 @@
       },
       {
         "args": [
-          "dromaeo.cssqueryjquery",
+          "system_health.webview_startup",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "dromaeo.cssqueryjquery",
+        "name": "system_health.webview_startup",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -243,7 +261,7 @@
       },
       {
         "args": [
-          "dromaeo.cssqueryjquery",
+          "system_health.webview_startup",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
@@ -251,7 +269,7 @@
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "dromaeo.cssqueryjquery.reference",
+        "name": "system_health.webview_startup.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],