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

tools/perf/benchmarks/system_health.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # 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
 from telemetry import benchmark
 from telemetry.timeline import chrome_trace_category_filter
 from telemetry.web_perf import timeline_based_measurement
 import page_sets
 
 
 # See tr.v.Numeric.getSummarizedScalarNumericsWithNames()
@@ skipping 11 matching lines @@
     1) Be rearchitected such that it doesn't. This is the most preferred option.
     2) Be run in a separate test suite (e.g. memory).
 
   https://goo.gl/Jek2NL.
   """
 
   def CreateTimelineBasedMeasurementOptions(self):
     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
 
   def CreateStorySet(self, options):
     return page_sets.SystemHealthStorySet(platform=self.PLATFORM)
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True
@@ skipping 137 matching lines @@
   and load a blank page with multiprocess enabled.
   """
 
   def SetExtraBrowserOptions(self, options):
     options.AppendExtraBrowserArgs(
         ['--webview-sandboxed-renderer'])
 
   @classmethod
   def Name(cls):
     return 'system_health.webview_startup_multiprocess'