[system-health] Unify SH stories interface

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.web_perf import timeline_based_measurement
 import page_sets
 from telemetry import benchmark
 
 
@@ skipping 37 matching lines @@
   @classmethod
   def Name(cls):
     return 'battor.tough_video_cases'
 
 
 # TODO(rnephew): Add a version that scrolls.
 class BattOrSystemHealthLoadingDesktop(_BattOrBenchmark):
   """Desktop Chrome Memory System Health Benchmark."""
 
   def CreateStorySet(self, options):
-    return page_sets.DesktopSystemHealthStorySet(take_memory_measurement=False)
+    return page_sets.SystemHealthStorySet(platform='desktop',
+                                          story_name_regex=r'load:.*')
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return (possible_browser.platform.GetDeviceTypeName() != 'Desktop' or
             not possible_browser.platform.HasBattOrConnected())
 
   @classmethod
   def Name(cls):
     return 'battor.system_health_loading_desktop'
 
 
 class BattOrSystemHealthLoadingMobile(_BattOrBenchmark):
   """Mobile Chrome Memory System Health Benchmark."""
 
   def CreateStorySet(self, options):
-    return page_sets.MobileSystemHealthStorySet(take_memory_measurement=False)
+    return page_sets.SystemHealthStorySet(platform='mobile',
+                                          story_name_regex=r'load:.*')
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     if possible_browser.platform.GetDeviceTypeName() == 'Desktop':
       return True
     if (possible_browser.browser_type == 'reference' and
         possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X'):
       return True
     return not possible_browser.platform.HasBattOrConnected()
 
@@ skipping 19 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'