Revert of Use page_set_module.PageSet instead of story.StorySet (patchset #1 id:1 of https://codereview.chromium.org/1221553003/)

Reason for revert:
This should no longer be required due to Ned's fix in https://codereview.chromium.org/1217823005/

Original issue's description:
> Use page_set_module.PageSet instead of story.StorySet
>
> BUG=skia:3967
> NOTRY=true
> TBR=nednguyen
>
> Committed: https://skia.googlesource.com/skia/+/7b971f0152299ae9a924252a9bfd220318497bdd

TBR=nednguyen@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3967

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

24 files changed, 48 insertions, 48 deletions

diff --git a/tools/skp/page_sets/skia_carsvg_desktop.py b/tools/skp/page_sets/skia_carsvg_desktop.py
index 04fc2854a2..602c89f052 100644
--- a/tools/skp/page_sets/skia_carsvg_desktop.py
+++ b/tools/skp/page_sets/skia_carsvg_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -20,7 +20,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     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 """
 
diff --git a/tools/skp/page_sets/skia_chalkboard_desktop.py b/tools/skp/page_sets/skia_chalkboard_desktop.py
index 31f8741572..a235849330 100644
--- a/tools/skp/page_sets/skia_chalkboard_desktop.py
+++ b/tools/skp/page_sets/skia_chalkboard_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -20,7 +20,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     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 """
 
diff --git a/tools/skp/page_sets/skia_css3gradients_desktop.py b/tools/skp/page_sets/skia_css3gradients_desktop.py
index 91eae50d67..f0613f922e 100644
--- a/tools/skp/page_sets/skia_css3gradients_desktop.py
+++ b/tools/skp/page_sets/skia_css3gradients_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -27,7 +27,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_digg_nexus10.py b/tools/skp/page_sets/skia_digg_nexus10.py
index 862b72dfee..3c1b80d5f6 100644
--- a/tools/skp/page_sets/skia_digg_nexus10.py
+++ b/tools/skp/page_sets/skia_digg_nexus10.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -23,7 +23,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     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 """
 
diff --git a/tools/skp/page_sets/skia_espn_desktop.py b/tools/skp/page_sets/skia_espn_desktop.py
index 29440c7016..08250df48b 100644
--- a/tools/skp/page_sets/skia_espn_desktop.py
+++ b/tools/skp/page_sets/skia_espn_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
index 37e39deb59..903da4a430 100644
--- a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
+++ b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_gmail_nexus10.py b/tools/skp/page_sets/skia_gmail_nexus10.py
index 7f6d4b98c9..7d2537296a 100644
--- a/tools/skp/page_sets/skia_gmail_nexus10.py
+++ b/tools/skp/page_sets/skia_gmail_nexus10.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -28,7 +28,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_gmailthread_desktop.py b/tools/skp/page_sets/skia_gmailthread_desktop.py
index f1d82410c4..2f581740aa 100644
--- a/tools/skp/page_sets/skia_gmailthread_desktop.py
+++ b/tools/skp/page_sets/skia_gmailthread_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -28,7 +28,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_googlehome_desktop.py b/tools/skp/page_sets/skia_googlehome_desktop.py
index 553f27f3d4..4f75fe2b1b 100644
--- a/tools/skp/page_sets/skia_googlehome_desktop.py
+++ b/tools/skp/page_sets/skia_googlehome_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
index 12b1595373..7b2a901ec9 100644
--- a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -20,7 +20,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     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 """
 
diff --git a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
index a28af9ba17..c55d89a735 100644
--- a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_mapsvg_desktop.py b/tools/skp/page_sets/skia_mapsvg_desktop.py
index 6460f5cff4..4ab07b3a34 100644
--- a/tools/skp/page_sets/skia_mapsvg_desktop.py
+++ b/tools/skp/page_sets/skia_mapsvg_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -20,7 +20,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     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 """
 
diff --git a/tools/skp/page_sets/skia_mozilla_nexus10.py b/tools/skp/page_sets/skia_mozilla_nexus10.py
index e9b1338a5a..cc9eb8a73e 100644
--- a/tools/skp/page_sets/skia_mozilla_nexus10.py
+++ b/tools/skp/page_sets/skia_mozilla_nexus10.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_nytimes_desktop.py b/tools/skp/page_sets/skia_nytimes_desktop.py
index 07176d4ce4..dc6be1d9e5 100644
--- a/tools/skp/page_sets/skia_nytimes_desktop.py
+++ b/tools/skp/page_sets/skia_nytimes_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_pokemonwiki_desktop.py b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
index 1545597794..961ca61c34 100644
--- a/tools/skp/page_sets/skia_pokemonwiki_desktop.py
+++ b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_pravda_nexus10.py b/tools/skp/page_sets/skia_pravda_nexus10.py
index b28da4a094..5083870db7 100644
--- a/tools/skp/page_sets/skia_pravda_nexus10.py
+++ b/tools/skp/page_sets/skia_pravda_nexus10.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_samoasvg_desktop.py b/tools/skp/page_sets/skia_samoasvg_desktop.py
index b049c04054..ee367133b3 100644
--- a/tools/skp/page_sets/skia_samoasvg_desktop.py
+++ b/tools/skp/page_sets/skia_samoasvg_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_theverge_desktop.py b/tools/skp/page_sets/skia_theverge_desktop.py
index 69eebdec9d..07fbd6753e 100644
--- a/tools/skp/page_sets/skia_theverge_desktop.py
+++ b/tools/skp/page_sets/skia_theverge_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_tigersvg_desktop.py b/tools/skp/page_sets/skia_tigersvg_desktop.py
index df793cfdb1..c11f28dc7a 100644
--- a/tools/skp/page_sets/skia_tigersvg_desktop.py
+++ b/tools/skp/page_sets/skia_tigersvg_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_ugamsolutions_desktop.py b/tools/skp/page_sets/skia_ugamsolutions_desktop.py
index 69be7ce048..bc97600f34 100644
--- a/tools/skp/page_sets/skia_ugamsolutions_desktop.py
+++ b/tools/skp/page_sets/skia_ugamsolutions_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_unicodetable_desktop.py b/tools/skp/page_sets/skia_unicodetable_desktop.py
index f61c71802d..adbfa0b334 100644
--- a/tools/skp/page_sets/skia_unicodetable_desktop.py
+++ b/tools/skp/page_sets/skia_unicodetable_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -25,7 +25,7 @@ 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 """
 
diff --git a/tools/skp/page_sets/skia_wikipedia_desktop.py b/tools/skp/page_sets/skia_wikipedia_desktop.py
index 9b6c4fecd6..eebe89a566 100644
--- a/tools/skp/page_sets/skia_wikipedia_desktop.py
+++ b/tools/skp/page_sets/skia_wikipedia_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -20,7 +20,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     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 """
 
diff --git a/tools/skp/page_sets/skia_worldjournal_nexus10.py b/tools/skp/page_sets/skia_worldjournal_nexus10.py
index 955a1cef90..9444ea96c0 100644
--- a/tools/skp/page_sets/skia_worldjournal_nexus10.py
+++ b/tools/skp/page_sets/skia_worldjournal_nexus10.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -20,7 +20,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     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 """
 
diff --git a/tools/skp/page_sets/skia_wowwiki_desktop.py b/tools/skp/page_sets/skia_wowwiki_desktop.py
index dc53d405cf..2ac9ee525e 100644
--- a/tools/skp/page_sets/skia_wowwiki_desktop.py
+++ b/tools/skp/page_sets/skia_wowwiki_desktop.py
@@ -4,8 +4,8 @@
 # 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
 
 
@@ -24,7 +24,7 @@ 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 """