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

tools/perf/benchmarks/battor.py

Index: tools/perf/benchmarks/battor.py
diff --git a/tools/perf/benchmarks/battor.py b/tools/perf/benchmarks/battor.py
index 052edd85d670082020d0c612f7a217b3a1cab840..aeb863c83d6344f5636e604d32d5ed0319b2d1c5 100644
--- a/tools/perf/benchmarks/battor.py
+++ b/tools/perf/benchmarks/battor.py
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import os
-
 from core import perf_benchmark
 from telemetry.timeline import chrome_trace_category_filter
 from telemetry.web_perf import timeline_based_measurement
@@ -23,11 +21,7 @@ class _BattOrBenchmark(perf_benchmark.PerfBenchmark):
     # TODO(charliea): Reenable the CPU tracing agent once it no longer causes
     # indefinite hangs on Windows.
     # https://crbug.com/647443
-    # 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.config.enable_atrace_trace = True
     options.config.atrace_config.categories = ['sched']
@@ -79,11 +73,7 @@ class BattOrPowerCasesNoChromeTrace(_BattOrBenchmark):
 
   def CreateTimelineBasedMeasurementOptions(self):
     options = timeline_based_measurement.Options()
-    # 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 = False
     options.config.chrome_trace_config.SetDefaultOverheadFilter()
     options.SetTimelineBasedMetrics(['powerMetric', 'clockSyncLatencyMetric'])