Reenable the Mac BattOr benchmarks on the main waterfall

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 62b75c9e7fcd91311bffa906b4af2db1a539310d..2cbc14ecfae92af0266f99c48e6944e92fb115e2 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.web_perf import timeline_based_measurement
 import page_sets
@@ -34,17 +32,7 @@ class _BattOrBenchmark(perf_benchmark.PerfBenchmark):
     # 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):