Migrate PageSets to StorySets in buildbot page sets

BUG=skia:3967
NOTRY=true
TBR=

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

24 files changed, 120 insertions, 120 deletions

diff --git a/tools/skp/page_sets/skia_carsvg_desktop.py b/tools/skp/page_sets/skia_carsvg_desktop.py
index c8bb4ca8dd..602c89f052 100644
--- a/tools/skp/page_sets/skia_carsvg_desktop.py
+++ b/tools/skp/page_sets/skia_carsvg_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,18 +15,17 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_carsvg_desktop.json'
 
 
-class SkiaCarsvgDesktopPageSet(page_set_module.PageSet):
+class SkiaCarsvgDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaCarsvgDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_carsvg_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_chalkboard_desktop.py b/tools/skp/page_sets/skia_chalkboard_desktop.py
index 0998b7b0c7..a235849330 100644
--- a/tools/skp/page_sets/skia_chalkboard_desktop.py
+++ b/tools/skp/page_sets/skia_chalkboard_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,18 +15,17 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_chalkboard_desktop.json'
 
 
-class SkiaChalkboardDesktopPageSet(page_set_module.PageSet):
+class SkiaChalkboardDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaChalkboardDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_chalkboard_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_css3gradients_desktop.py b/tools/skp/page_sets/skia_css3gradients_desktop.py
index dbc1f374c8..f0613f922e 100644
--- a/tools/skp/page_sets/skia_css3gradients_desktop.py
+++ b/tools/skp/page_sets/skia_css3gradients_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_css3gradients_desktop.json'
 
   def RunSmoothness(self, action_runner):
@@ -26,13 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class SkiaCss3gradientsDesktopPageSet(page_set_module.PageSet):
+class SkiaCss3gradientsDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaCss3gradientsDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_css3gradients_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_digg_nexus10.py b/tools/skp/page_sets/skia_digg_nexus10.py
index 68a5f1b68a..3c1b80d5f6 100644
--- a/tools/skp/page_sets/skia_digg_nexus10.py
+++ b/tools/skp/page_sets/skia_digg_nexus10.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,21 +15,20 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'tablet'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_digg_nexus10.json'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.Navigate(self.url)
     action_runner.Wait(5)
 
-class SkiaDiggNexus10PageSet(page_set_module.PageSet):
+class SkiaDiggNexus10PageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaDiggNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
       archive_data_file='data/skia_digg_nexus10.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_espn_desktop.py b/tools/skp/page_sets/skia_espn_desktop.py
index 38ab36853e..08250df48b 100644
--- a/tools/skp/page_sets/skia_espn_desktop.py
+++ b/tools/skp/page_sets/skia_espn_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_espn_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SkiaEspnDesktopPageSet(page_set_module.PageSet):
+class SkiaEspnDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaEspnDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_espn_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
index 78ef86f425..903da4a430 100644
--- a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
+++ b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'tablet'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_gamedeksiam_nexus10.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SkiaGamedeksiamNexus10PageSet(page_set_module.PageSet):
+class SkiaGamedeksiamNexus10PageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaGamedeksiamNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
       archive_data_file='data/skia_gamedeksiam_nexus10.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_gmail_nexus10.py b/tools/skp/page_sets/skia_gmail_nexus10.py
index 1b6140fbf4..7d2537296a 100644
--- a/tools/skp/page_sets/skia_gmail_nexus10.py
+++ b/tools/skp/page_sets/skia_gmail_nexus10.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'tablet'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_gmail_nexus10.json'
     self.credentials = 'google'
 
@@ -27,13 +28,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class SkiaGmailNexus10PageSet(page_set_module.PageSet):
+class SkiaGmailNexus10PageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaGmailNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
       archive_data_file='data/skia_gmail_nexus10.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_gmailthread_desktop.py b/tools/skp/page_sets/skia_gmailthread_desktop.py
index 7fefa2fd6f..2f581740aa 100644
--- a/tools/skp/page_sets/skia_gmailthread_desktop.py
+++ b/tools/skp/page_sets/skia_gmailthread_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_gmailthread_desktop.json'
     self.credentials = 'google'
 
@@ -27,13 +28,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class SkiaGmailthreadDesktopPageSet(page_set_module.PageSet):
+class SkiaGmailthreadDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaGmailthreadDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_gmailthread_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_googlehome_desktop.py b/tools/skp/page_sets/skia_googlehome_desktop.py
index ab7a7abd54..4f75fe2b1b 100644
--- a/tools/skp/page_sets/skia_googlehome_desktop.py
+++ b/tools/skp/page_sets/skia_googlehome_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_googlehome_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SkiaGooglehomeDesktopPageSet(page_set_module.PageSet):
+class SkiaGooglehomeDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaGooglehomeDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_googlehome_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
index 841feb02be..7b2a901ec9 100644
--- a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,18 +15,17 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_googlespreadsheet_desktop.json'
 
 
-class SkiaGooglespreadsheetDesktopPageSet(page_set_module.PageSet):
+class SkiaGooglespreadsheetDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaGooglespreadsheetDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_googlespreadsheet_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
index bfb88126c9..c55d89a735 100644
--- a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_jsfiddlebigcar_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SkiaJsfiddlebigcarDesktopPageSet(page_set_module.PageSet):
+class SkiaJsfiddlebigcarDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaJsfiddlebigcarDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_jsfiddlebigcar_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_mapsvg_desktop.py b/tools/skp/page_sets/skia_mapsvg_desktop.py
index 5daa18c009..4ab07b3a34 100644
--- a/tools/skp/page_sets/skia_mapsvg_desktop.py
+++ b/tools/skp/page_sets/skia_mapsvg_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,18 +15,17 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_mapsvg_desktop.json'
 
 
-class SkiaMapsvgDesktopPageSet(page_set_module.PageSet):
+class SkiaMapsvgDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaMapsvgDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_mapsvg_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_mozilla_nexus10.py b/tools/skp/page_sets/skia_mozilla_nexus10.py
index a8b35332b3..cc9eb8a73e 100644
--- a/tools/skp/page_sets/skia_mozilla_nexus10.py
+++ b/tools/skp/page_sets/skia_mozilla_nexus10.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'tablet'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_mozilla_nexus10.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SkiaMozillaNexus10PageSet(page_set_module.PageSet):
+class SkiaMozillaNexus10PageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaMozillaNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
       archive_data_file='data/skia_mozilla_nexus10.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_nytimes_desktop.py b/tools/skp/page_sets/skia_nytimes_desktop.py
index 3f72b91cfd..dc6be1d9e5 100644
--- a/tools/skp/page_sets/skia_nytimes_desktop.py
+++ b/tools/skp/page_sets/skia_nytimes_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_nytimes_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class SkiaNytimesDesktopPageSet(page_set_module.PageSet):
+class SkiaNytimesDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaNytimesDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_nytimes_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_pokemonwiki_desktop.py b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
index 612657c197..961ca61c34 100644
--- a/tools/skp/page_sets/skia_pokemonwiki_desktop.py
+++ b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_pokemonwiki_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SkiaPokemonwikiDesktopPageSet(page_set_module.PageSet):
+class SkiaPokemonwikiDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaPokemonwikiDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_pokemonwiki_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_pravda_nexus10.py b/tools/skp/page_sets/skia_pravda_nexus10.py
index 9cefaca094..5083870db7 100644
--- a/tools/skp/page_sets/skia_pravda_nexus10.py
+++ b/tools/skp/page_sets/skia_pravda_nexus10.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'tablet'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_pravda_nexus10.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SkiaPravdaNexus10PageSet(page_set_module.PageSet):
+class SkiaPravdaNexus10PageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaPravdaNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
       archive_data_file='data/skia_pravda_nexus10.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_samoasvg_desktop.py b/tools/skp/page_sets/skia_samoasvg_desktop.py
index 5cc760ed09..ee367133b3 100644
--- a/tools/skp/page_sets/skia_samoasvg_desktop.py
+++ b/tools/skp/page_sets/skia_samoasvg_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_samoasvg_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SkiaSamoasvgDesktopPageSet(page_set_module.PageSet):
+class SkiaSamoasvgDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaSamoasvgDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_samoasvg_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_theverge_desktop.py b/tools/skp/page_sets/skia_theverge_desktop.py
index dd8182ccbf..07fbd6753e 100644
--- a/tools/skp/page_sets/skia_theverge_desktop.py
+++ b/tools/skp/page_sets/skia_theverge_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_theverge_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class SkiaThevergeDesktopPageSet(page_set_module.PageSet):
+class SkiaThevergeDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaThevergeDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_theverge_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_tigersvg_desktop.py b/tools/skp/page_sets/skia_tigersvg_desktop.py
index 2e490a274c..c11f28dc7a 100644
--- a/tools/skp/page_sets/skia_tigersvg_desktop.py
+++ b/tools/skp/page_sets/skia_tigersvg_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_tigersvg_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SkiaTigersvgDesktopPageSet(page_set_module.PageSet):
+class SkiaTigersvgDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaTigersvgDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_tigersvg_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_ugamsolutions_desktop.py b/tools/skp/page_sets/skia_ugamsolutions_desktop.py
index 83c445d300..bc97600f34 100644
--- a/tools/skp/page_sets/skia_ugamsolutions_desktop.py
+++ b/tools/skp/page_sets/skia_ugamsolutions_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_ugamsolutions_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class SkiaUgamsolutionsDesktopPageSet(page_set_module.PageSet):
+class SkiaUgamsolutionsDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaUgamsolutionsDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_ugamsolutions_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_unicodetable_desktop.py b/tools/skp/page_sets/skia_unicodetable_desktop.py
index 735c3ee819..adbfa0b334 100644
--- a/tools/skp/page_sets/skia_unicodetable_desktop.py
+++ b/tools/skp/page_sets/skia_unicodetable_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_unicodetable_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -24,13 +25,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(20)
 
 
-class SkiaUnicodetableDesktopPageSet(page_set_module.PageSet):
+class SkiaUnicodetableDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaUnicodetableDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_unicodetable_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_wikipedia_desktop.py b/tools/skp/page_sets/skia_wikipedia_desktop.py
index fa7b70ce53..eebe89a566 100644
--- a/tools/skp/page_sets/skia_wikipedia_desktop.py
+++ b/tools/skp/page_sets/skia_wikipedia_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,18 +15,17 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_wikipedia_desktop.json'
 
 
-class SkiaWikipediaDesktopPageSet(page_set_module.PageSet):
+class SkiaWikipediaDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaWikipediaDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_wikipedia_desktop.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_worldjournal_nexus10.py b/tools/skp/page_sets/skia_worldjournal_nexus10.py
index 42abb96733..9444ea96c0 100644
--- a/tools/skp/page_sets/skia_worldjournal_nexus10.py
+++ b/tools/skp/page_sets/skia_worldjournal_nexus10.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,18 +15,17 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'tablet'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.Shared10InchTabletPageState)
     self.archive_data_file = 'data/skia_worldjournal_nexus10.json'
 
 
-class SkiaWorldjournalNexus10PageSet(page_set_module.PageSet):
+class SkiaWorldjournalNexus10PageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaWorldjournalNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
       archive_data_file='data/skia_worldjournal_nexus10.json')
 
     urls_list = [
diff --git a/tools/skp/page_sets/skia_wowwiki_desktop.py b/tools/skp/page_sets/skia_wowwiki_desktop.py
index 2de1b29c12..2ac9ee525e 100644
--- a/tools/skp/page_sets/skia_wowwiki_desktop.py
+++ b/tools/skp/page_sets/skia_wowwiki_desktop.py
@@ -4,8 +4,9 @@
 # pylint: disable=W0401,W0614
 
 
+from telemetry import story
 from telemetry.page import page as page_module
-from telemetry.page import page_set as page_set_module
+from telemetry.page import shared_page_state
 
 
 class SkiaBuildbotDesktopPage(page_module.Page):
@@ -14,8 +15,8 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     super(SkiaBuildbotDesktopPage, self).__init__(
         url=url,
         page_set=page_set,
-        credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
+        credentials_path='data/credentials.json',
+        shared_page_state_class=shared_page_state.SharedDesktopPageState)
     self.archive_data_file = 'data/skia_wowwiki_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
@@ -23,13 +24,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(25)
 
 
-class SkiaWowwikiDesktopPageSet(page_set_module.PageSet):
+class SkiaWowwikiDesktopPageSet(story.StorySet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
     super(SkiaWowwikiDesktopPageSet, self).__init__(
-      user_agent_type='desktop',
       archive_data_file='data/skia_wowwiki_desktop.json')
 
     urls_list = [