Revert "[Perf] Enable system_health.* for histogram uploads"

This reverts commit f3f89493.

Reason for revert: Causing failures

Original change's description:
> [Perf] Enable system_health.* for histogram uploads
> 
> This CL switches all system_health benchmarks to the histogram pipeline.
> 
> Bug: 744736
> Change-Id: Icb97397ec417d27220e489651cc51591757d8c9e
> Reviewed-on: https://chromium-review.googlesource.com/1048626
> Reviewed-by: Emily Hanley <eyaich@chromium.org>
> Commit-Queue: Ethan Kuefner <eakuefner@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#556842}

TBR=eakuefner@chromium.org,eyaich@chromium.org

Change-Id: I53f1788cc1f488b207a0718e8fbe14e2899af5b7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 744736
Reviewed-on: https://chromium-review.googlesource.com/1052407Reviewed-by: Ethan Kuefner <eakuefner@chromium.org>
Commit-Queue: Ethan Kuefner <eakuefner@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557211}

testing/buildbot/chromium.perf.json

@@ -3795,7 +3795,7 @@
           "-v",
           "--upload-results",
           "--browser=android-chromium",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_mobile",
@@ -3824,7 +3824,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -3855,7 +3855,7 @@
           "-v",
           "--upload-results",
           "--browser=android-chromium",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_mobile",
@@ -3884,7 +3884,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -8548,7 +8548,7 @@
           "-v",
           "--upload-results",
           "--browser=android-chromium",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_mobile",
@@ -8577,7 +8577,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -8608,7 +8608,7 @@
           "-v",
           "--upload-results",
           "--browser=android-chromium",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_mobile",
@@ -8637,7 +8637,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -11271,7 +11271,7 @@
           "-v",
           "--upload-results",
           "--browser=android-webview",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk"
         ],
         "isolate_name": "telemetry_perf_webview_tests",
@@ -11301,7 +11301,7 @@
           "-v",
           "--upload-results",
           "--browser=android-webview",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk"
         ],
         "isolate_name": "telemetry_perf_webview_tests",
@@ -11331,7 +11331,7 @@
           "-v",
           "--upload-results",
           "--browser=android-webview",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk"
         ],
         "isolate_name": "telemetry_perf_webview_tests",
@@ -13555,7 +13555,7 @@
           "-v",
           "--upload-results",
           "--browser=android-webview",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk"
         ],
         "isolate_name": "telemetry_perf_webview_tests",
@@ -13585,7 +13585,7 @@
           "-v",
           "--upload-results",
           "--browser=android-webview",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk"
         ],
         "isolate_name": "telemetry_perf_webview_tests",
@@ -13615,7 +13615,7 @@
           "-v",
           "--upload-results",
           "--browser=android-webview",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk"
         ],
         "isolate_name": "telemetry_perf_webview_tests",
@@ -17787,7 +17787,7 @@
           "-v",
           "--upload-results",
           "--browser=android-chromium",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_mobile",
@@ -17816,7 +17816,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -17847,7 +17847,7 @@
           "-v",
           "--upload-results",
           "--browser=android-chromium",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_mobile",
@@ -17876,7 +17876,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -22118,7 +22118,7 @@
           "-v",
           "--upload-results",
           "--browser=release",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_desktop",
@@ -22148,7 +22148,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -22180,7 +22180,7 @@
           "-v",
           "--upload-results",
           "--browser=release",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_desktop",
@@ -22210,7 +22210,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -26160,7 +26160,7 @@
           "-v",
           "--upload-results",
           "--browser=release",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_desktop",
@@ -26190,7 +26190,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -26222,7 +26222,7 @@
           "-v",
           "--upload-results",
           "--browser=release",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_desktop",
@@ -26252,7 +26252,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -30186,7 +30186,7 @@
           "-v",
           "--upload-results",
           "--browser=release",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_desktop",
@@ -30216,7 +30216,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -30248,7 +30248,7 @@
           "-v",
           "--upload-results",
           "--browser=release",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_desktop",
@@ -30278,7 +30278,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -34062,7 +34062,7 @@
           "-v",
           "--upload-results",
           "--browser=release_x64",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_desktop",
@@ -34092,7 +34092,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -34124,7 +34124,7 @@
           "-v",
           "--upload-results",
           "--browser=release_x64",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_desktop",
@@ -34154,7 +34154,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -37980,7 +37980,7 @@
           "-v",
           "--upload-results",
           "--browser=release_x64",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_desktop",
@@ -38010,7 +38010,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -38042,7 +38042,7 @@
           "-v",
           "--upload-results",
           "--browser=release_x64",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_desktop",
@@ -38072,7 +38072,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -41940,7 +41940,7 @@
           "-v",
           "--upload-results",
           "--browser=release_x64",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_desktop",
@@ -41970,7 +41970,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -42002,7 +42002,7 @@
           "-v",
           "--upload-results",
           "--browser=release_x64",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_desktop",
@@ -42032,7 +42032,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -45903,7 +45903,7 @@
           "-v",
           "--upload-results",
           "--browser=release_x64",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_desktop",
@@ -45933,7 +45933,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -45965,7 +45965,7 @@
           "-v",
           "--upload-results",
           "--browser=release_x64",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_desktop",
@@ -45995,7 +45995,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -49866,7 +49866,7 @@
           "-v",
           "--upload-results",
           "--browser=release",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.common_desktop",
@@ -49896,7 +49896,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],
@@ -49928,7 +49928,7 @@
           "-v",
           "--upload-results",
           "--browser=release",
-          "--output-format=histograms"
+          "--output-format=chartjson"
         ],
         "isolate_name": "telemetry_perf_tests",
         "name": "system_health.memory_desktop",
@@ -49958,7 +49958,7 @@
           "-v",
           "--upload-results",
           "--browser=reference",
-          "--output-format=histograms",
+          "--output-format=chartjson",
           "--max-failures=5",
           "--output-trace-tag=_ref"
         ],

testing/scripts/run_performance_tests.py

@@ -72,12 +72,7 @@ BENCHMARKS_TO_OUTPUT_HISTOGRAMS = [
     'blink_perf.parser',
     'blink_perf.shadow_dom',
     'blink_perf.svg',
-    'memory.top_10_mobile',
-    'system_health.common_desktop',
-    'system_health.common_mobile',
-    'system_health.memory_desktop',
-    'system_health.memory_mobile',
-    'system_health.webview_startup',
+    'memory.top_10_mobile'
 ]
 
 # We currently have two different sharding schemes for android

tools/perf/core/perf_data_generator.py

@@ -461,12 +461,7 @@ BENCHMARKS_TO_OUTPUT_HISTOGRAMS = [
     'blink_perf.parser',
     'blink_perf.shadow_dom',
     'blink_perf.svg',
-    'memory.top_10_mobile',
-    'system_health.common_desktop',
-    'system_health.common_mobile',
-    'system_health.memory_desktop',
-    'system_health.memory_mobile',
-    'system_health.webview_startup',
+    'memory.top_10_mobile'
 ]