Revert of [Telemetry] Modify CreatePageSet to CreateStorySet

tools/perf/benchmarks/blink_perf.py

 # Copyright 2013 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 import benchmark
 from telemetry.core import util
 from telemetry import page as page_module
 from telemetry.page import page_set
 from telemetry.page import page_test
 from telemetry.page import shared_page_state
 from telemetry.value import list_of_scalar_values
 
 from page_sets import webgl_supported_shared_state
 
 
 BLINK_PERF_BASE_DIR = os.path.join(util.GetChromiumSrcDir(),
                                    'third_party', 'WebKit', 'PerformanceTests')
 SKIPPED_FILE = os.path.join(BLINK_PERF_BASE_DIR, 'Skipped')
 
 
-def CreateStorySetFromPath(path, skipped_file,
+def CreatePageSetFromPath(path, skipped_file,
                           shared_page_state_class=(
                             shared_page_state.SharedPageState)):
   assert os.path.exists(path)
 
   page_urls = []
   serving_dirs = set()
 
   def _AddPage(path):
     if not path.endswith('.html'):
       return
@@ skipping 88 matching lines @@
 
 @benchmark.Disabled  # http://crbug.com/500958
 class BlinkPerfBindings(perf_benchmark.PerfBenchmark):
   tag = 'bindings'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.bindings'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'Bindings')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 @benchmark.Enabled('content-shell')
 class BlinkPerfBlinkGC(perf_benchmark.PerfBenchmark):
   tag = 'blink_gc'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.blink_gc'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'BlinkGC')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 class BlinkPerfCSS(perf_benchmark.PerfBenchmark):
   tag = 'css'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.css'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'CSS')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 @benchmark.Disabled('xp',  # http://crbug.com/488059
                     'android')  # http://crbug.com/496707
 class BlinkPerfCanvas(perf_benchmark.PerfBenchmark):
   tag = 'canvas'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.canvas'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'Canvas')
-    return CreateStorySetFromPath(
+    return CreatePageSetFromPath(
       path, SKIPPED_FILE,
       shared_page_state_class=(
         webgl_supported_shared_state.WebGLSupportedSharedState))
 
 
 class BlinkPerfDOM(perf_benchmark.PerfBenchmark):
   tag = 'dom'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.dom'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'DOM')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 @benchmark.Disabled('release_x64')  # http://crbug.com/480999
 class BlinkPerfEvents(perf_benchmark.PerfBenchmark):
   tag = 'events'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.events'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'Events')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 @benchmark.Disabled('win8')  # http://crbug.com/462350
 class BlinkPerfLayout(perf_benchmark.PerfBenchmark):
   tag = 'layout'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.layout'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'Layout')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 @benchmark.Enabled('content-shell')
 class BlinkPerfLayoutFullLayout(BlinkPerfLayout):
   tag = 'layout_full_frame'
   test = _BlinkPerfFullFrameMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.layout_full_frame'
 
 
 class BlinkPerfMutation(perf_benchmark.PerfBenchmark):
   tag = 'mutation'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.mutation'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'Mutation')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 @benchmark.Disabled('win')  # crbug.com/488493
 class BlinkPerfParser(perf_benchmark.PerfBenchmark):
   tag = 'parser'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.parser'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'Parser')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 class BlinkPerfSVG(perf_benchmark.PerfBenchmark):
   tag = 'svg'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.svg'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'SVG')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 @benchmark.Enabled('content-shell')
 class BlinkPerfSVGFullLayout(BlinkPerfSVG):
   tag = 'svg_full_frame'
   test = _BlinkPerfFullFrameMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.svg_full_frame'
 
 
 class BlinkPerfShadowDOM(perf_benchmark.PerfBenchmark):
   tag = 'shadow_dom'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.shadow_dom'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'ShadowDOM')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)
 
 
 # This benchmark is for local testing, doesn't need to run on bots.
 @benchmark.Disabled()
 class BlinkPerfXMLHttpRequest(perf_benchmark.PerfBenchmark):
   tag = 'xml_http_request'
   test = _BlinkPerfMeasurement
 
   @classmethod
   def Name(cls):
     return 'blink_perf.xml_http_request'
 
-  def CreateStorySet(self, options):
+  def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'XMLHttpRequest')
-    return CreateStorySetFromPath(path, SKIPPED_FILE)
+    return CreatePageSetFromPath(path, SKIPPED_FILE)