Revert "[telemetry] Disable perf benchmarks that use BattOr tracing"

tools/perf/benchmarks/system_health.py

Index: tools/perf/benchmarks/system_health.py
diff --git a/tools/perf/benchmarks/system_health.py b/tools/perf/benchmarks/system_health.py
index 4cbd8a9aa1e48788b10bed7093c71170fd6904e3..6303fbbb7bc8be859fd3059ec518869d108d53db 100644
--- a/tools/perf/benchmarks/system_health.py
+++ b/tools/perf/benchmarks/system_health.py
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import os
 import re
 
 from core import perf_benchmark
@@ -34,11 +33,7 @@ class _CommonSystemHealthBenchmark(perf_benchmark.PerfBenchmark):
     options = timeline_based_measurement.Options(
         chrome_trace_category_filter.ChromeTraceCategoryFilter())
     options.config.chrome_trace_config.category_filter.AddFilterString('rail')
-    # TODO(charliea): Reenable BattOr tracing on the main perf waterfall once
-    # the BattOrs stop crashing as their SD cards fill up.
-    # crbug.com/652384
-    options.config.enable_battor_trace = (
-        os.environ.get('BUILDBOT_MASTERNAME') == 'chromium.perf.fyi')
+    options.config.enable_battor_trace = True
     options.config.enable_chrome_trace = True
     options.SetTimelineBasedMetrics(['clockSyncLatencyMetric', 'powerMetric'])
     return options