Remove check for Galaxy S5s from BattOrBenchmark's ShouldDisable

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.
 
 from core import perf_benchmark
 from telemetry.timeline import chrome_trace_category_filter
 from telemetry.web_perf import timeline_based_measurement
 import page_sets
 from telemetry import benchmark
 
@@ skipping 11 matching lines @@
     options.config.atrace_config.categories = ['sched']
     options.config.enable_battor_trace = True
     options.config.enable_chrome_trace = True
     options.config.enable_cpu_trace = True
     options.SetTimelineBasedMetrics(
         ['powerMetric', 'clockSyncLatencyMetric', 'cpuTimeMetric'])
     return options
 
   @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'
-    return possible_browser.platform.GetDeviceTypeName() == galaxy_s5_type_name
+    return not possible_browser.platform.HasBattOrConnected()
 
   @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 29 matching lines @@
 @benchmark.Enabled('mac')
 class BattOrSteadyStatePages(_BattOrBenchmark):
 
   def CreateStorySet(self, options):
     # We want it to wait for 30 seconds to be comparable to legacy power tests.
     return page_sets.IdleAfterLoadingStories(wait_in_seconds=30)
 
   @classmethod
   def Name(cls):
     return 'battor.steady_state'