Reenable the Mac BattOr benchmarks on the main waterfall

tools/perf/benchmarks/battor.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
-
 from core import perf_benchmark
 from telemetry.web_perf import timeline_based_measurement
 import page_sets
 from telemetry import benchmark
 
 
 # TODO(rnephew): Remove BattOr naming from all benchmarks once the BattOr tests
 # are the primary means of benchmarking power.
 class _BattOrBenchmark(perf_benchmark.PerfBenchmark):
 
@@ skipping 10 matching lines @@
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # Only run if BattOr is detected.
     if not possible_browser.platform.HasBattOrConnected():
       return True
 
     # Galaxy S5s have problems with running system health metrics.
     # http://crbug.com/600463
     galaxy_s5_type_name = 'SM-G900H'
-    if possible_browser.platform.GetDeviceTypeName() == galaxy_s5_type_name:
-      return True
-
-    # TODO(charliea): The BattOr agent is failing intermittently on Mac. We
-    # still want it running on the FYI waterfall to track the flakiness, but
-    # want it disabled on the main perf waterfall until we can make things
-    # stable.
-    # http://crbug.com/634188
-    return (possible_browser.platform.GetOSName() == 'mac' and
-            'BUILDBOT_MASTERNAME' in os.environ and
-            os.environ['BUILDBOT_MASTERNAME'] == 'chromium.perf')
+    return possible_browser.platform.GetDeviceTypeName() == galaxy_s5_type_name
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True
 
 
 # android: See battor.android.tough_video_cases below
 # win8: crbug.com/531618
 # crbug.com/565180: Only include cases that report time_to_play
 # Taken directly from media benchmark.
@@ skipping 63 matching lines @@
     options = timeline_based_measurement.Options()
     options.config.enable_battor_trace = True
     options.config.enable_chrome_trace = False
     options.config.chrome_trace_config.SetDefaultOverheadFilter()
     options.SetTimelineBasedMetrics(['powerMetric', 'clockSyncLatencyMetric'])
     return options
 
   @classmethod
   def Name(cls):
     return 'battor.power_cases_no_chrome_trace'