Revert of [Telemetry] Modify CreatePageSet to CreateStorySet

tools/perf/benchmarks/blink_perf.py

Index: tools/perf/benchmarks/blink_perf.py
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py
index 528d25b2532b6df64a82e0d5a29d583733c5514f..9d9f44ac900c67517e27aa3f224850d218f6ff9e 100644
--- a/tools/perf/benchmarks/blink_perf.py
+++ b/tools/perf/benchmarks/blink_perf.py
@@ -22,7 +22,7 @@
 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)
@@ -131,9 +131,9 @@
   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')
@@ -145,9 +145,9 @@
   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):
@@ -158,9 +158,9 @@
   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
@@ -173,9 +173,9 @@
   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))
@@ -189,9 +189,9 @@
   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
@@ -203,9 +203,9 @@
   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
@@ -217,9 +217,9 @@
   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')
@@ -240,9 +240,9 @@
   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
@@ -254,9 +254,9 @@
   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):
@@ -267,9 +267,9 @@
   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')
@@ -290,9 +290,9 @@
   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.
@@ -305,6 +305,6 @@
   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)