Migrate from telemetry PageSet -> StorySet.

BUG=439512

Review URL: https://codereview.chromium.org/1218073014

Cr-Commit-Position: refs/heads/master@{#337685}

20 files changed, 145 insertions, 145 deletions

diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
index 162d690..1e35165 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py
@@ -13,7 +13,7 @@ NON_SAFE_BROWSING_BROWSERS = ['mac', 'linux', 'win', 'chromeos',
 class ChromeProxyClientVersion(ChromeProxyBenchmark):
   tag = 'client_version'
   test = measurements.ChromeProxyClientVersion
-  page_set = pagesets.SyntheticPageSet
+  page_set = pagesets.SyntheticStorySet
 
   @classmethod
   def Name(cls):
@@ -23,7 +23,7 @@ class ChromeProxyClientVersion(ChromeProxyBenchmark):
 class ChromeProxyClientType(ChromeProxyBenchmark):
   tag = 'client_type'
   test = measurements.ChromeProxyClientType
-  page_set = pagesets.ClientTypePageSet
+  page_set = pagesets.ClientTypeStorySet
 
   @classmethod
   def Name(cls):
@@ -33,7 +33,7 @@ class ChromeProxyClientType(ChromeProxyBenchmark):
 class ChromeProxyLoFi(ChromeProxyBenchmark):
   tag = 'lo_fi'
   test = measurements.ChromeProxyLoFi
-  page_set = pagesets.LoFiPageSet
+  page_set = pagesets.LoFiStorySet
 
   @classmethod
   def Name(cls):
@@ -43,7 +43,7 @@ class ChromeProxyLoFi(ChromeProxyBenchmark):
 class ChromeProxyExpDirective(ChromeProxyBenchmark):
   tag = 'exp_directive'
   test = measurements.ChromeProxyExpDirective
-  page_set = pagesets.ExpDirectivePageSet
+  page_set = pagesets.ExpDirectiveStorySet
 
   @classmethod
   def Name(cls):
@@ -53,7 +53,7 @@ class ChromeProxyExpDirective(ChromeProxyBenchmark):
 class ChromeProxyPassThrough(ChromeProxyBenchmark):
   tag = 'pass_through'
   test = measurements.ChromeProxyPassThrough
-  page_set = pagesets.PassThroughPageSet
+  page_set = pagesets.PassThroughStorySet
 
   @classmethod
   def Name(cls):
@@ -63,7 +63,7 @@ class ChromeProxyPassThrough(ChromeProxyBenchmark):
 class ChromeProxyBypass(ChromeProxyBenchmark):
   tag = 'bypass'
   test = measurements.ChromeProxyBypass
-  page_set = pagesets.BypassPageSet
+  page_set = pagesets.BypassStorySet
 
   @classmethod
   def Name(cls):
@@ -73,7 +73,7 @@ class ChromeProxyBypass(ChromeProxyBenchmark):
 class ChromeProxyCorsBypass(ChromeProxyBenchmark):
   tag = 'bypass'
   test = measurements.ChromeProxyCorsBypass
-  page_set = pagesets.CorsBypassPageSet
+  page_set = pagesets.CorsBypassStorySet
 
   @classmethod
   def Name(cls):
@@ -83,7 +83,7 @@ class ChromeProxyCorsBypass(ChromeProxyBenchmark):
 class ChromeProxyBlockOnce(ChromeProxyBenchmark):
   tag = 'block_once'
   test = measurements.ChromeProxyBlockOnce
-  page_set = pagesets.BlockOncePageSet
+  page_set = pagesets.BlockOnceStorySet
 
   @classmethod
   def Name(cls):
@@ -96,11 +96,11 @@ class ChromeProxySafeBrowsingOn(ChromeProxyBenchmark):
   tag = 'safebrowsing_on'
   test = measurements.ChromeProxySafebrowsingOn
 
-  # Override CreateStorySet so that we can instantiate SafebrowsingPageSet
+  # Override CreateStorySet so that we can instantiate SafebrowsingStorySet
   # with a non default param.
   def CreateStorySet(self, options):
     del options  # unused
-    return pagesets.SafebrowsingPageSet(expect_timeout=True)
+    return pagesets.SafebrowsingStorySet(expect_timeout=True)
 
   @classmethod
   def Name(cls):
@@ -112,7 +112,7 @@ class ChromeProxySafeBrowsingOn(ChromeProxyBenchmark):
 class ChromeProxySafeBrowsingOff(ChromeProxyBenchmark):
   tag = 'safebrowsing_off'
   test = measurements.ChromeProxySafebrowsingOff
-  page_set = pagesets.SafebrowsingPageSet
+  page_set = pagesets.SafebrowsingStorySet
 
   @classmethod
   def Name(cls):
@@ -122,7 +122,7 @@ class ChromeProxySafeBrowsingOff(ChromeProxyBenchmark):
 class ChromeProxyHTTPFallbackProbeURL(ChromeProxyBenchmark):
   tag = 'fallback_probe'
   test = measurements.ChromeProxyHTTPFallbackProbeURL
-  page_set = pagesets.SyntheticPageSet
+  page_set = pagesets.SyntheticStorySet
 
   @classmethod
   def Name(cls):
@@ -132,7 +132,7 @@ class ChromeProxyHTTPFallbackProbeURL(ChromeProxyBenchmark):
 class ChromeProxyHTTPFallbackViaHeader(ChromeProxyBenchmark):
   tag = 'fallback_viaheader'
   test = measurements.ChromeProxyHTTPFallbackViaHeader
-  page_set = pagesets.FallbackViaHeaderPageSet
+  page_set = pagesets.FallbackViaHeaderStorySet
 
   @classmethod
   def Name(cls):
@@ -142,7 +142,7 @@ class ChromeProxyHTTPFallbackViaHeader(ChromeProxyBenchmark):
 class ChromeProxyHTTPToDirectFallback(ChromeProxyBenchmark):
   tag = 'http_to_direct_fallback'
   test = measurements.ChromeProxyHTTPToDirectFallback
-  page_set = pagesets.HTTPToDirectFallbackPageSet
+  page_set = pagesets.HTTPToDirectFallbackStorySet
 
   @classmethod
   def Name(cls):
@@ -153,7 +153,7 @@ class ChromeProxyHTTPToDirectFallback(ChromeProxyBenchmark):
 class ChromeProxyReenableAfterBypass(ChromeProxyBenchmark):
   tag = 'reenable_after_bypass'
   test = measurements.ChromeProxyReenableAfterBypass
-  page_set = pagesets.ReenableAfterBypassPageSet
+  page_set = pagesets.ReenableAfterBypassStorySet
 
   @classmethod
   def Name(cls):
@@ -163,7 +163,7 @@ class ChromeProxyReenableAfterBypass(ChromeProxyBenchmark):
 class ChromeProxySmoke(ChromeProxyBenchmark):
   tag = 'smoke'
   test = measurements.ChromeProxySmoke
-  page_set = pagesets.SmokePageSet
+  page_set = pagesets.SmokeStorySet
 
   @classmethod
   def Name(cls):
@@ -173,7 +173,7 @@ class ChromeProxySmoke(ChromeProxyBenchmark):
 class ChromeProxyClientConfig(ChromeProxyBenchmark):
   tag = 'client_config'
   test = measurements.ChromeProxyClientConfig
-  page_set = pagesets.SyntheticPageSet
+  page_set = pagesets.SyntheticStorySet
 
   @classmethod
   def Name(cls):
@@ -184,7 +184,7 @@ class ChromeProxyClientConfig(ChromeProxyBenchmark):
 class ChromeProxyVideoDirect(benchmark.Benchmark):
   tag = 'video'
   test = measurements.ChromeProxyVideoValidation
-  page_set = pagesets.VideoDirectPageSet
+  page_set = pagesets.VideoDirectStorySet
 
   @classmethod
   def Name(cls):
@@ -195,7 +195,7 @@ class ChromeProxyVideoDirect(benchmark.Benchmark):
 class ChromeProxyVideoProxied(benchmark.Benchmark):
   tag = 'video'
   test = measurements.ChromeProxyVideoValidation
-  page_set = pagesets.VideoProxiedPageSet
+  page_set = pagesets.VideoProxiedStorySet
 
   @classmethod
   def Name(cls):
@@ -212,7 +212,7 @@ class ChromeProxyVideoCompare(benchmark.Benchmark):
 
   tag = 'video'
   test = measurements.ChromeProxyVideoValidation
-  page_set = pagesets.VideoComparePageSet
+  page_set = pagesets.VideoCompareStorySet
 
   @classmethod
   def Name(cls):
@@ -224,7 +224,7 @@ class ChromeProxyVideoFrames(benchmark.Benchmark):
 
   tag = 'video'
   test = measurements.ChromeProxyInstrumentedVideoValidation
-  page_set = pagesets.VideoFramePageSet
+  page_set = pagesets.VideoFrameStorySet
 
   @classmethod
   def Name(cls):
@@ -236,7 +236,7 @@ class ChromeProxyVideoAudio(benchmark.Benchmark):
 
   tag = 'video'
   test = measurements.ChromeProxyInstrumentedVideoValidation
-  page_set = pagesets.VideoAudioPageSet
+  page_set = pagesets.VideoAudioStorySet
 
   @classmethod
   def Name(cls):
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py
index 9f24d4d..799c246 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py
@@ -7,21 +7,21 @@ import os
 import sys
 
 from telemetry.core import discover
-from telemetry.page import page_set
+from telemetry import story
 import video
 
 
-# Import all submodules' PageSet classes.
+# Import all submodules' StorySet classes.
 start_dir = os.path.dirname(os.path.abspath(__file__))
 top_level_dir = os.path.abspath(os.path.join(start_dir, os.pardir, os.pardir))
-base_class = page_set.PageSet
+base_class = story.StorySet
 for cls in discover.DiscoverClasses(
     start_dir, top_level_dir, base_class).values():
   setattr(sys.modules[__name__], cls.__name__, cls)
 
 # DiscoverClasses makes the assumption that there is exactly one matching
 # class per file, however the following are declared in the same file.
-for cls in (video.VideoDirectPageSet,
-            video.VideoProxiedPageSet,
-            video.VideoComparePageSet):
+for cls in (video.VideoDirectStorySet,
+            video.VideoProxiedStorySet,
+            video.VideoCompareStorySet):
   setattr(sys.modules[__name__], cls.__name__, cls)
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/block_once.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/block_once.py
index ce3fd0d..07f0e08 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/block_once.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/block_once.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class BlockOncePage(page_module.Page):
@@ -31,12 +31,12 @@ class BlockOncePage(page_module.Page):
     ''')
     action_runner.Wait(1)
 
-class BlockOncePageSet(page_set_module.PageSet):
+class BlockOnceStorySet(story.StorySet):
 
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(BlockOncePageSet, self).__init__()
+    super(BlockOnceStorySet, self).__init__()
 
     # Test block-once for a GET request.
     urls_list = [
@@ -44,4 +44,4 @@ class BlockOncePageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddUserStory(BlockOncePage(url, self))
+      self.AddStory(BlockOncePage(url, self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/bypass.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/bypass.py
index 7a682a1..1958bb2 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/bypass.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/bypass.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class BypassPage(page_module.Page):
@@ -12,16 +12,16 @@ class BypassPage(page_module.Page):
     super(BypassPage, self).__init__(url=url, page_set=page_set)
 
 
-class BypassPageSet(page_set_module.PageSet):
+class BypassStorySet(story.StorySet):
 
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(BypassPageSet, self).__init__()
+    super(BypassStorySet, self).__init__()
 
     urls_list = [
       'http://check.googlezip.net/block/',
     ]
 
     for url in urls_list:
-      self.AddUserStory(BypassPage(url, self))
+      self.AddStory(BypassPage(url, self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/client_type.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/client_type.py
index 7350822..0b91897 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/client_type.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/client_type.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class ClientTypePage(page_module.Page):
@@ -22,53 +22,53 @@ class ClientTypePage(page_module.Page):
     self.bypass_for_client_type = bypass_for_client_type
 
 
-class ClientTypePageSet(page_set_module.PageSet):
+class ClientTypeStorySet(story.StorySet):
   """Chrome proxy test sites"""
 
   def __init__(self):
-    super(ClientTypePageSet, self).__init__()
+    super(ClientTypeStorySet, self).__init__()
 
     # Page that should not bypass for any client types. This page is here in
     # order to determine the Chrome-Proxy client type value before running any
     # of the following pages, since there's no way to get the client type value
     # from a request that was bypassed.
-    self.AddUserStory(ClientTypePage(
+    self.AddStory(ClientTypePage(
         url='http://check.googlezip.net/test.html',
         page_set=self,
         bypass_for_client_type='none'))
 
     # Page that should cause a bypass for android chrome clients.
-    self.AddUserStory(ClientTypePage(
+    self.AddStory(ClientTypePage(
         url='http://check.googlezip.net/chrome-proxy-header/c_android/',
         page_set=self,
         bypass_for_client_type='android'))
 
     # Page that should cause a bypass for android webview clients.
-    self.AddUserStory(ClientTypePage(
+    self.AddStory(ClientTypePage(
         url='http://check.googlezip.net/chrome-proxy-header/c_webview/',
         page_set=self,
         bypass_for_client_type='webview'))
 
     # Page that should cause a bypass for iOS clients.
-    self.AddUserStory(ClientTypePage(
+    self.AddStory(ClientTypePage(
         url='http://check.googlezip.net/chrome-proxy-header/c_ios/',
         page_set=self,
         bypass_for_client_type='ios'))
 
     # Page that should cause a bypass for Linux clients.
-    self.AddUserStory(ClientTypePage(
+    self.AddStory(ClientTypePage(
         url='http://check.googlezip.net/chrome-proxy-header/c_linux/',
         page_set=self,
         bypass_for_client_type='linux'))
 
     # Page that should cause a bypass for Windows clients.
-    self.AddUserStory(ClientTypePage(
+    self.AddStory(ClientTypePage(
         url='http://check.googlezip.net/chrome-proxy-header/c_win/',
         page_set=self,
         bypass_for_client_type='win'))
 
     # Page that should cause a bypass for ChromeOS clients.
-    self.AddUserStory(ClientTypePage(
+    self.AddStory(ClientTypePage(
         url='http://check.googlezip.net/chrome-proxy-header/c_chromeos/',
         page_set=self,
         bypass_for_client_type='chromeos'))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/corsbypass.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/corsbypass.py
index c03d624..04c56f1 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/corsbypass.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/corsbypass.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class CorsBypassPage(page_module.Page):
@@ -12,16 +12,16 @@ class CorsBypassPage(page_module.Page):
     super(CorsBypassPage, self).__init__(url=url, page_set=page_set)
 
 
-class CorsBypassPageSet(page_set_module.PageSet):
+class CorsBypassStorySet(story.StorySet):
 
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(CorsBypassPageSet, self).__init__()
+    super(CorsBypassStorySet, self).__init__()
 
     urls_list = [
       'http://www.gstatic.com/chrome/googlezip/cors/',
     ]
 
     for url in urls_list:
-      self.AddUserStory(CorsBypassPage(url, self))
+      self.AddStory(CorsBypassPage(url, self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/exp_directive.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/exp_directive.py
index 701f21d..450ea83 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/exp_directive.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/exp_directive.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class ExpDirectivePage(page_module.Page):
@@ -13,15 +13,15 @@ class ExpDirectivePage(page_module.Page):
     super(ExpDirectivePage, self).__init__(url=url, page_set=page_set)
 
 
-class ExpDirectivePageSet(page_set_module.PageSet):
+class ExpDirectiveStorySet(story.StorySet):
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(ExpDirectivePageSet, self).__init__()
+    super(ExpDirectiveStorySet, self).__init__()
 
     urls_list = [
       'http://check.googlezip.net/exp/',
     ]
 
     for url in urls_list:
-      self.AddUserStory(ExpDirectivePage(url, self))
+      self.AddStory(ExpDirectivePage(url, self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/fallback_viaheader.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/fallback_viaheader.py
index a1ec2ca..8b3dc56 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/fallback_viaheader.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/fallback_viaheader.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class FallbackViaHeaderPage(page_module.Page):
@@ -12,11 +12,11 @@ class FallbackViaHeaderPage(page_module.Page):
     super(FallbackViaHeaderPage, self).__init__(url=url, page_set=page_set)
 
 
-class FallbackViaHeaderPageSet(page_set_module.PageSet):
+class FallbackViaHeaderStorySet(story.StorySet):
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(FallbackViaHeaderPageSet, self).__init__()
+    super(FallbackViaHeaderStorySet, self).__init__()
 
     urls_list = [
         'http://chromeproxy-test.appspot.com/default?respStatus=200',
@@ -24,4 +24,4 @@ class FallbackViaHeaderPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddUserStory(FallbackViaHeaderPage(url, self))
+      self.AddStory(FallbackViaHeaderPage(url, self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/http_to_direct_fallback.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/http_to_direct_fallback.py
index 239b2a0..c43dc6d 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/http_to_direct_fallback.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/http_to_direct_fallback.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class HTTPToDirectFallbackPage(page_module.Page):
@@ -12,10 +12,10 @@ class HTTPToDirectFallbackPage(page_module.Page):
     super(HTTPToDirectFallbackPage, self).__init__(url=url, page_set=page_set)
 
 
-class HTTPToDirectFallbackPageSet(page_set_module.PageSet):
+class HTTPToDirectFallbackStorySet(story.StorySet):
   """Chrome proxy test sites"""
   def __init__(self):
-    super(HTTPToDirectFallbackPageSet, self).__init__()
+    super(HTTPToDirectFallbackStorySet, self).__init__()
 
     urls_list = [
       'http://check.googlezip.net/fallback/',
@@ -23,4 +23,4 @@ class HTTPToDirectFallbackPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddUserStory(HTTPToDirectFallbackPage(url, self))
+      self.AddStory(HTTPToDirectFallbackPage(url, self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/lo_fi.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/lo_fi.py
index 0fd578d..fbc1eaa 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/lo_fi.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/lo_fi.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class LoFiPage(page_module.Page):
@@ -16,15 +16,15 @@ class LoFiPage(page_module.Page):
     super(LoFiPage, self).__init__(url=url, page_set=page_set)
 
 
-class LoFiPageSet(page_set_module.PageSet):
+class LoFiStorySet(story.StorySet):
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(LoFiPageSet, self).__init__()
+    super(LoFiStorySet, self).__init__()
 
     urls_list = [
       'http://check.googlezip.net/image.png',
     ]
 
     for url in urls_list:
-      self.AddUserStory(LoFiPage(url, self))
+      self.AddStory(LoFiPage(url, self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/pass_through.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/pass_through.py
index f55bbfb..259dc70 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/pass_through.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/pass_through.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 class PassThroughPage(page_module.Page):
   """
@@ -25,15 +25,15 @@ class PassThroughPage(page_module.Page):
     action_runner.Wait(1)
 
 
-class PassThroughPageSet(page_set_module.PageSet):
+class PassThroughStorySet(story.StorySet):
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(PassThroughPageSet, self).__init__()
+    super(PassThroughStorySet, self).__init__()
 
     urls_list = [
       'http://check.googlezip.net/image.png',
     ]
 
     for url in urls_list:
-      self.AddUserStory(PassThroughPage(url, self))
\ No newline at end of file
+      self.AddStory(PassThroughPage(url, self))
\ No newline at end of file
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/reenable_after_bypass.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/reenable_after_bypass.py
index dc74029..8c9befb 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/reenable_after_bypass.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/reenable_after_bypass.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class ReenableAfterBypassPage(page_module.Page):
@@ -26,15 +26,15 @@ class ReenableAfterBypassPage(page_module.Page):
     self.bypass_seconds_max = bypass_seconds_max
 
 
-class ReenableAfterBypassPageSet(page_set_module.PageSet):
+class ReenableAfterBypassStorySet(story.StorySet):
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(ReenableAfterBypassPageSet, self).__init__()
+    super(ReenableAfterBypassStorySet, self).__init__()
 
     # Test page for "Chrome-Proxy: block=0". Loading this page should cause all
     # data reduction proxies to be bypassed for one to five minutes.
-    self.AddUserStory(ReenableAfterBypassPage(
+    self.AddStory(ReenableAfterBypassPage(
         url="http://check.googlezip.net/block",
         page_set=self,
         bypass_seconds_min=60,
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/safebrowsing.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/safebrowsing.py
index 9047ae6..5c47806 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/safebrowsing.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/safebrowsing.py
@@ -5,7 +5,7 @@ import logging
 
 from telemetry.core import exceptions
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class SafebrowsingPage(page_module.Page):
@@ -29,12 +29,12 @@ class SafebrowsingPage(page_module.Page):
         raise e
 
 
-class SafebrowsingPageSet(page_set_module.PageSet):
+class SafebrowsingStorySet(story.StorySet):
 
   """ Chrome proxy test sites """
 
   def __init__(self, expect_timeout=False):
-    super(SafebrowsingPageSet, self).__init__()
+    super(SafebrowsingStorySet, self).__init__()
 
-    self.AddUserStory(
+    self.AddStory(
         SafebrowsingPage('http://www.ianfette.org/', self, expect_timeout))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/smoke.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/smoke.py
index a169a96..9243114 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/smoke.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/smoke.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class SmokePage(page_module.Page):
@@ -78,15 +78,15 @@ class Page5(SmokePage):
 
 
 
-class SmokePageSet(page_set_module.PageSet):
+class SmokeStorySet(story.StorySet):
 
   """ Chrome proxy test sites """
 
   def __init__(self):
-    super(SmokePageSet, self).__init__()
+    super(SmokeStorySet, self).__init__()
 
-    self.AddUserStory(Page1(self))
-    self.AddUserStory(Page2(self))
-    self.AddUserStory(Page3(self))
-    self.AddUserStory(Page4(self))
-    self.AddUserStory(Page5(self))
+    self.AddStory(Page1(self))
+    self.AddStory(Page2(self))
+    self.AddStory(Page3(self))
+    self.AddStory(Page4(self))
+    self.AddStory(Page5(self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/synthetic.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/synthetic.py
index 3fef221..2840d9a 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/synthetic.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/synthetic.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class SyntheticPage(page_module.Page):
@@ -12,12 +12,12 @@ class SyntheticPage(page_module.Page):
     super(SyntheticPage, self).__init__(url=url, page_set=page_set)
 
 
-class SyntheticPageSet(page_set_module.PageSet):
+class SyntheticStorySet(story.StorySet):
 
   """ Chrome proxy synthetic test pages. """
 
   def __init__(self):
-    super(SyntheticPageSet, self).__init__()
+    super(SyntheticStorySet, self).__init__()
 
     urls_list = [
       'http://check.googlezip.net/test.html',
@@ -25,4 +25,4 @@ class SyntheticPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddUserStory(SyntheticPage(url, self))
+      self.AddStory(SyntheticPage(url, self))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/video.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/video.py
index 51f005c..dc923af 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/video.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/video.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class VideoPage(page_module.Page):
@@ -19,44 +19,44 @@ class VideoPage(page_module.Page):
     self.use_chrome_proxy = use_chrome_proxy
 
 
-class VideoPageSet(page_set_module.PageSet):
+class VideoStorySet(story.StorySet):
   """Base class for Chrome proxy video tests."""
 
   def __init__(self, mode):
-    super(VideoPageSet, self).__init__()
+    super(VideoStorySet, self).__init__()
     urls_list = [
         'http://check.googlezip.net/cacheable/video/buck_bunny_tiny.html',
     ]
     for url in urls_list:
-      self._AddUserStoryForURL(url)
+      self._AddStoryForURL(url)
 
-  def _AddUserStoryForURL(self, url):
+  def _AddStoryForURL(self, url):
     raise NotImplementedError
 
 
-class VideoDirectPageSet(VideoPageSet):
+class VideoDirectStorySet(VideoStorySet):
   """Chrome proxy video tests: direct fetch."""
   def __init__(self):
-    super(VideoDirectPageSet, self).__init__('direct')
+    super(VideoDirectStorySet, self).__init__('direct')
 
-  def _AddUserStoryForURL(self, url):
-      self.AddUserStory(VideoPage(url, self, False))
+  def _AddStoryForURL(self, url):
+      self.AddStory(VideoPage(url, self, False))
 
 
-class VideoProxiedPageSet(VideoPageSet):
+class VideoProxiedStorySet(VideoStorySet):
   """Chrome proxy video tests: proxied fetch."""
   def __init__(self):
-    super(VideoProxiedPageSet, self).__init__('proxied')
+    super(VideoProxiedStorySet, self).__init__('proxied')
 
-  def _AddUserStoryForURL(self, url):
-      self.AddUserStory(VideoPage(url, self, True))
+  def _AddStoryForURL(self, url):
+      self.AddStory(VideoPage(url, self, True))
 
 
-class VideoComparePageSet(VideoPageSet):
+class VideoCompareStorySet(VideoStorySet):
   """Chrome proxy video tests: compare direct and proxied fetches."""
   def __init__(self):
-    super(VideoComparePageSet, self).__init__('compare')
+    super(VideoCompareStorySet, self).__init__('compare')
 
-  def _AddUserStoryForURL(self, url):
-      self.AddUserStory(VideoPage(url, self, False))
-      self.AddUserStory(VideoPage(url, self, True))
+  def _AddStoryForURL(self, url):
+      self.AddStory(VideoPage(url, self, False))
+      self.AddStory(VideoPage(url, self, True))
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/video_instrumented.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/video_instrumented.py
index 7465317..8cd993b 100644
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/video_instrumented.py
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/video_instrumented.py
@@ -3,23 +3,23 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
-class VideoFramePageSet(page_set_module.PageSet):
+class VideoFrameStorySet(story.StorySet):
   """Chrome proxy video tests: verify frames of transcoded videos"""
   def __init__(self):
-    super(VideoFramePageSet, self).__init__()
+    super(VideoFrameStorySet, self).__init__()
     for url in [
         'http://check.googlezip.net/cacheable/video/buck_bunny_640x360_24fps_video.html',
         'http://check.googlezip.net/cacheable/video/buck_bunny_60fps_video.html',
         ]:
-      self.AddUserStory(page_module.Page(url, self))
+      self.AddStory(page_module.Page(url, self))
 
-class VideoAudioPageSet(page_set_module.PageSet):
+class VideoAudioStorySet(story.StorySet):
   """Chrome proxy video tests: verify audio of transcoded videos"""
   def __init__(self):
-    super(VideoAudioPageSet, self).__init__()
+    super(VideoAudioStorySet, self).__init__()
     for url in [
         'http://check.googlezip.net/cacheable/video/buck_bunny_640x360_24fps_audio.html',
         ]:
-      self.AddUserStory(page_module.Page(url, self))
+      self.AddStory(page_module.Page(url, self))
diff --git a/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py b/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py
index 7f4b707..1f1814f 100644
--- a/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py
+++ b/tools/chrome_proxy/live_tests/chrome_proxy_benchmark.py
@@ -10,7 +10,7 @@ from telemetry import benchmark
 class ChromeProxyLatency(benchmark.Benchmark):
   tag = 'latency'
   test = measurements.ChromeProxyLatency
-  page_set = pagesets.Top20PageSet
+  page_set = pagesets.Top20StorySet
 
   @classmethod
   def Name(cls):
@@ -20,7 +20,7 @@ class ChromeProxyLatency(benchmark.Benchmark):
 class ChromeProxyLatencyDirect(benchmark.Benchmark):
   tag = 'latency_direct'
   test = measurements.ChromeProxyLatency
-  page_set = pagesets.Top20PageSet
+  page_set = pagesets.Top20StorySet
 
   @classmethod
   def Name(cls):
@@ -30,7 +30,7 @@ class ChromeProxyLatencyDirect(benchmark.Benchmark):
 class ChromeProxyDataSaving(benchmark.Benchmark):
   tag = 'data_saving'
   test = measurements.ChromeProxyDataSaving
-  page_set = pagesets.Top20PageSet
+  page_set = pagesets.Top20StorySet
 
   @classmethod
   def Name(cls):
@@ -40,7 +40,7 @@ class ChromeProxyDataSaving(benchmark.Benchmark):
 class ChromeProxyDataSavingDirect(benchmark.Benchmark):
   tag = 'data_saving_direct'
   test = measurements.ChromeProxyDataSaving
-  page_set = pagesets.Top20PageSet
+  page_set = pagesets.Top20StorySet
 
   @classmethod
   def Name(cls):
diff --git a/tools/chrome_proxy/live_tests/pagesets/__init__.py b/tools/chrome_proxy/live_tests/pagesets/__init__.py
index 1ea4db1..45ce4af 100644
--- a/tools/chrome_proxy/live_tests/pagesets/__init__.py
+++ b/tools/chrome_proxy/live_tests/pagesets/__init__.py
@@ -7,13 +7,13 @@ import os
 import sys
 
 from telemetry.core import discover
-from telemetry.page import page_set
+from telemetry import story
 
 
-# Import all submodules' PageSet classes.
+# Import all submodules' StorySet classes.
 start_dir = os.path.dirname(os.path.abspath(__file__))
 top_level_dir = os.path.abspath(os.path.join(start_dir, os.pardir, os.pardir))
-base_class = page_set.PageSet
+base_class = story.StorySet
 for cls in discover.DiscoverClasses(
     start_dir, top_level_dir, base_class).values():
   setattr(sys.modules[__name__], cls.__name__, cls)
diff --git a/tools/chrome_proxy/live_tests/pagesets/top_20.py b/tools/chrome_proxy/live_tests/pagesets/top_20.py
index 22ec8a6..3e5897d 100644
--- a/tools/chrome_proxy/live_tests/pagesets/top_20.py
+++ b/tools/chrome_proxy/live_tests/pagesets/top_20.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry import story
 
 
 class Top20Page(page_module.Page):
@@ -12,80 +12,80 @@ class Top20Page(page_module.Page):
     super(Top20Page, self).__init__(url=url, page_set=page_set, name=name)
     self.archive_data_file = '../data/chrome_proxy_top_20.json'
 
-class Top20PageSet(page_set_module.PageSet):
+class Top20StorySet(story.StorySet):
 
   """ Pages hand-picked for Chrome Proxy tests. """
 
   def __init__(self):
-    super(Top20PageSet, self).__init__(
+    super(Top20StorySet, self).__init__(
       archive_data_file='../data/chrome_proxy_top_20.json')
 
     # Why: top google property; a google tab is often open
-    self.AddUserStory(Top20Page('https://www.google.com/#hl=en&q=barack+obama',
+    self.AddStory(Top20Page('https://www.google.com/#hl=en&q=barack+obama',
                                 self))
 
     # Why: #3 (Alexa global)
-    self.AddUserStory(Top20Page('http://www.youtube.com', self))
+    self.AddStory(Top20Page('http://www.youtube.com', self))
 
     # Why: #18 (Alexa global), Picked an interesting post
-    self.AddUserStory(Top20Page(
+    self.AddStory(Top20Page(
       # pylint: disable=C0301
       'http://en.blog.wordpress.com/2012/09/04/freshly-pressed-editors-picks-for-august-2012/',
       self, 'Wordpress'))
 
     # Why: top social,Public profile
-    self.AddUserStory(Top20Page('http://www.facebook.com/barackobama', self,
+    self.AddStory(Top20Page('http://www.facebook.com/barackobama', self,
                                 'Facebook'))
 
     # Why: #12 (Alexa global),Public profile
-    self.AddUserStory(Top20Page('http://www.linkedin.com/in/linustorvalds',
+    self.AddStory(Top20Page('http://www.linkedin.com/in/linustorvalds',
                                 self, 'LinkedIn'))
 
     # Why: #6 (Alexa) most visited worldwide,Picked an interesting page
-    self.AddUserStory(Top20Page('http://en.wikipedia.org/wiki/Wikipedia', self,
+    self.AddStory(Top20Page('http://en.wikipedia.org/wiki/Wikipedia', self,
                                 'Wikipedia (1 tab)'))
 
     # Why: #8 (Alexa global),Picked an interesting page
-    self.AddUserStory(Top20Page('https://twitter.com/katyperry', self,
+    self.AddStory(Top20Page('https://twitter.com/katyperry', self,
                                 'Twitter'))
 
     # Why: #37 (Alexa global)
-    self.AddUserStory(Top20Page('http://pinterest.com', self, 'Pinterest'))
+    self.AddStory(Top20Page('http://pinterest.com', self, 'Pinterest'))
 
     # Why: #1 sports
-    self.AddUserStory(Top20Page('http://espn.go.com', self, 'ESPN'))
+    self.AddStory(Top20Page('http://espn.go.com', self, 'ESPN'))
 
     # Why: #1 news worldwide (Alexa global)
-    self.AddUserStory(Top20Page('http://news.yahoo.com', self))
+    self.AddStory(Top20Page('http://news.yahoo.com', self))
 
     # Why: #2 news worldwide
-    self.AddUserStory(Top20Page('http://www.cnn.com', self))
+    self.AddStory(Top20Page('http://www.cnn.com', self))
 
     # Why: #7 (Alexa news); #27 total time spent,Picked interesting page
-    self.AddUserStory(Top20Page(
+    self.AddStory(Top20Page(
       'http://www.weather.com/weather/right-now/Mountain+View+CA+94043',
       self, 'Weather.com'))
 
     # Why: #1 world commerce website by visits; #3 commerce in the US by time
     # spent
-    self.AddUserStory(Top20Page('http://www.amazon.com', self))
+    self.AddStory(Top20Page('http://www.amazon.com', self))
 
     # Why: #1 commerce website by time spent by users in US
-    self.AddUserStory(Top20Page('http://www.ebay.com', self))
+    self.AddStory(Top20Page('http://www.ebay.com', self))
 
     # Why: #1 games according to Alexa (with actual games in it)
-    self.AddUserStory(Top20Page('http://games.yahoo.com', self))
+    self.AddStory(Top20Page('http://games.yahoo.com', self))
 
     # Why: #1 Alexa recreation
-    self.AddUserStory(Top20Page('http://booking.com', self))
+    self.AddStory(Top20Page('http://booking.com', self))
 
     # Why: #1 Alexa reference
-    self.AddUserStory(Top20Page('http://answers.yahoo.com', self))
+    self.AddStory(Top20Page('http://answers.yahoo.com', self))
 
     # Why: #1 Alexa sports
-    self.AddUserStory(Top20Page('http://sports.yahoo.com/', self))
+    self.AddStory(Top20Page('http://sports.yahoo.com/', self))
 
     # Why: top tech blog
-    self.AddUserStory(Top20Page('http://techcrunch.com', self))
+    self.AddStory(Top20Page('http://techcrunch.com', self))
 
-    self.AddUserStory(Top20Page('http://www.nytimes.com', self))
+    self.AddStory(Top20Page('http://www.nytimes.com', self))