[system-health] Unify SH stories interface

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 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
@@ skipping 60 matching lines @@
     ])
 
   def CreateTimelineBasedMeasurementOptions(self):
     options = timeline_based_measurement.Options(
         chrome_trace_category_filter.ChromeTraceCategoryFilter(
             '-*,disabled-by-default-memory-infra'))
     options.config.enable_android_graphics_memtrack = True
     options.SetTimelineBasedMetrics(['memoryMetric'])
     return options
 
+  def CreateStorySet(self, options):
+    return page_sets.SystemHealthStorySet(platform=self.PLATFORM,
+                                          story_name_regex=r'load:.*',
+                                          take_memory_measurement=True)
+
   @classmethod
   def Name(cls):
-    return 'system_health.memory_%s' % cls.page_set.PLATFORM
+    return 'system_health.memory_%s' % cls.PLATFORM
 
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, is_first_result):
     # TODO(crbug.com/610962): Remove this stopgap when the perf dashboard
     # is able to cope with the data load generated by TBMv2 metrics.
     return not _IGNORED_STATS_RE.search(value.name)
 
 
 class DesktopMemorySystemHealth(_MemorySystemHealthBenchmark):
   """Desktop Chrome Memory System Health Benchmark."""
-  page_set = page_sets.DesktopSystemHealthStorySet
+  PLATFORM = 'desktop'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # http://crbug.com/624355 (reference builds).
     return (possible_browser.platform.GetDeviceTypeName() != 'Desktop' or
             possible_browser.browser_type == 'reference')
 
 
 class MobileMemorySystemHealth(_MemorySystemHealthBenchmark):
   """Mobile Chrome Memory System Health Benchmark."""
-  page_set = page_sets.MobileSystemHealthStorySet
+  PLATFORM = 'mobile'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # http://crbug.com/612144 (reference on Nexus 5X).
     return possible_browser.platform.GetDeviceTypeName() == 'Desktop' or (
         possible_browser.browser_type == 'reference' and
         possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X')
 
+
 @benchmark.Enabled('android-webview')
 class WebviewStartupSystemHealthBenchmark(perf_benchmark.PerfBenchmark):
   """Webview startup time benchmark
 
   Benchmark that measures how long WebView takes to start up
   and load a blank page. Since thie metric only requires the trace
   markers recorded in atrace, Chrome tracing is not enabled for this
   benchmark.
   """
   page_set = page_sets.BlankPageSet
 
   def CreateTimelineBasedMeasurementOptions(self):
     options = timeline_based_measurement.Options()
     options.SetTimelineBasedMetrics(['webviewStartupMetric'])
     options.config.enable_atrace_trace = True
     options.config.enable_chrome_trace = False
     options.config.atrace_config.app_name = 'org.chromium.webview_shell'
     return options
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True
 
   @classmethod
   def Name(cls):
     return 'system_health.webview_startup'