webpages_playback.py: Page sets to use changed telemetry API (AddUserStory)

Make page sets to use telemetry.page.page_set.AddUserStory instead of
AddPage.

BUG=chromium:439512
BUG=skia:3196

NOTRY=true

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

61 files changed, 61 insertions, 61 deletions

diff --git a/tools/skp/page_sets/skia_amazon_desktop.py b/tools/skp/page_sets/skia_amazon_desktop.py
index 3d7c6270e1..3e1bd1ed2e 100644
--- a/tools/skp/page_sets/skia_amazon_desktop.py
+++ b/tools/skp/page_sets/skia_amazon_desktop.py
@@ -39,4 +39,4 @@ class SkiaAmazonDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_androidpolice_nexus10.py b/tools/skp/page_sets/skia_androidpolice_nexus10.py
index 8eb26fd0e9..c8daf0134d 100644
--- a/tools/skp/page_sets/skia_androidpolice_nexus10.py
+++ b/tools/skp/page_sets/skia_androidpolice_nexus10.py
@@ -40,4 +40,4 @@ class SkiaAndroidpoliceNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_baidu_desktop.py b/tools/skp/page_sets/skia_baidu_desktop.py
index c7baa24b7a..24a96d4cd2 100644
--- a/tools/skp/page_sets/skia_baidu_desktop.py
+++ b/tools/skp/page_sets/skia_baidu_desktop.py
@@ -39,4 +39,4 @@ class SkiaBaiduDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_blogger_desktop.py b/tools/skp/page_sets/skia_blogger_desktop.py
index b16a8722fd..4881fb4d36 100644
--- a/tools/skp/page_sets/skia_blogger_desktop.py
+++ b/tools/skp/page_sets/skia_blogger_desktop.py
@@ -39,4 +39,4 @@ class SkiaBloggerDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_booking_desktop.py b/tools/skp/page_sets/skia_booking_desktop.py
index 7960945545..bef74d89fa 100644
--- a/tools/skp/page_sets/skia_booking_desktop.py
+++ b/tools/skp/page_sets/skia_booking_desktop.py
@@ -38,4 +38,4 @@ class SkiaBookingDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_carsvg_desktop.py b/tools/skp/page_sets/skia_carsvg_desktop.py
index b2ed3227e1..c8bb4ca8dd 100644
--- a/tools/skp/page_sets/skia_carsvg_desktop.py
+++ b/tools/skp/page_sets/skia_carsvg_desktop.py
@@ -34,4 +34,4 @@ class SkiaCarsvgDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_chalkboard_desktop.py b/tools/skp/page_sets/skia_chalkboard_desktop.py
index 61be87c473..0998b7b0c7 100644
--- a/tools/skp/page_sets/skia_chalkboard_desktop.py
+++ b/tools/skp/page_sets/skia_chalkboard_desktop.py
@@ -35,4 +35,4 @@ class SkiaChalkboardDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_cnet_nexus10.py b/tools/skp/page_sets/skia_cnet_nexus10.py
index 1872594085..6b4eafb30a 100644
--- a/tools/skp/page_sets/skia_cnet_nexus10.py
+++ b/tools/skp/page_sets/skia_cnet_nexus10.py
@@ -38,4 +38,4 @@ class SkiaCnetNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_cnn_nexus10.py b/tools/skp/page_sets/skia_cnn_nexus10.py
index 54050c580a..695ef17793 100644
--- a/tools/skp/page_sets/skia_cnn_nexus10.py
+++ b/tools/skp/page_sets/skia_cnn_nexus10.py
@@ -38,4 +38,4 @@ class SkiaCnnNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_css3gradients_desktop.py b/tools/skp/page_sets/skia_css3gradients_desktop.py
index e827723295..a340f1b8f8 100644
--- a/tools/skp/page_sets/skia_css3gradients_desktop.py
+++ b/tools/skp/page_sets/skia_css3gradients_desktop.py
@@ -41,4 +41,4 @@ class SkiaCss3gradientsDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_culturalsolutions_nexus10.py b/tools/skp/page_sets/skia_culturalsolutions_nexus10.py
index bb7d0cc5eb..4331a45bb3 100644
--- a/tools/skp/page_sets/skia_culturalsolutions_nexus10.py
+++ b/tools/skp/page_sets/skia_culturalsolutions_nexus10.py
@@ -41,4 +41,4 @@ class SkiaCulturalsolutionsNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_cuteoverload_nexus10.py b/tools/skp/page_sets/skia_cuteoverload_nexus10.py
index 3f728ac12f..12fc6255b0 100644
--- a/tools/skp/page_sets/skia_cuteoverload_nexus10.py
+++ b/tools/skp/page_sets/skia_cuteoverload_nexus10.py
@@ -38,4 +38,4 @@ class SkiaCuteoverloadNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_deviantart_nexus10.py b/tools/skp/page_sets/skia_deviantart_nexus10.py
index 8cb5430d61..421489c85d 100644
--- a/tools/skp/page_sets/skia_deviantart_nexus10.py
+++ b/tools/skp/page_sets/skia_deviantart_nexus10.py
@@ -38,4 +38,4 @@ class SkiaDeviantartNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_digg_nexus10.py b/tools/skp/page_sets/skia_digg_nexus10.py
index b55c2a8183..84bc6a74e9 100644
--- a/tools/skp/page_sets/skia_digg_nexus10.py
+++ b/tools/skp/page_sets/skia_digg_nexus10.py
@@ -37,4 +37,4 @@ class SkiaDiggNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_ebay_desktop.py b/tools/skp/page_sets/skia_ebay_desktop.py
index 082dd02d08..07c4c14a4e 100644
--- a/tools/skp/page_sets/skia_ebay_desktop.py
+++ b/tools/skp/page_sets/skia_ebay_desktop.py
@@ -40,4 +40,4 @@ class SkiaEbayDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_engadget_nexus10.py b/tools/skp/page_sets/skia_engadget_nexus10.py
index 0f92732933..88d8577e7e 100644
--- a/tools/skp/page_sets/skia_engadget_nexus10.py
+++ b/tools/skp/page_sets/skia_engadget_nexus10.py
@@ -38,4 +38,4 @@ class SkiaEngadgetNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_espn_desktop.py b/tools/skp/page_sets/skia_espn_desktop.py
index 69498995a7..f143a8cf4d 100644
--- a/tools/skp/page_sets/skia_espn_desktop.py
+++ b/tools/skp/page_sets/skia_espn_desktop.py
@@ -38,4 +38,4 @@ class SkiaEspnDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_facebook_desktop.py b/tools/skp/page_sets/skia_facebook_desktop.py
index d212eb653f..2ef37413ec 100644
--- a/tools/skp/page_sets/skia_facebook_desktop.py
+++ b/tools/skp/page_sets/skia_facebook_desktop.py
@@ -43,4 +43,4 @@ class SkiaFacebookDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_fontwipe_desktop.py b/tools/skp/page_sets/skia_fontwipe_desktop.py
index 906de50b02..9288b614d5 100644
--- a/tools/skp/page_sets/skia_fontwipe_desktop.py
+++ b/tools/skp/page_sets/skia_fontwipe_desktop.py
@@ -38,4 +38,4 @@ class SkiaFontwipeDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_forecastio_desktop.py b/tools/skp/page_sets/skia_forecastio_desktop.py
index 7f9cded2e9..34cee15992 100644
--- a/tools/skp/page_sets/skia_forecastio_desktop.py
+++ b/tools/skp/page_sets/skia_forecastio_desktop.py
@@ -38,4 +38,4 @@ class SkiaForecastioDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_frantzen_nexus10.py b/tools/skp/page_sets/skia_frantzen_nexus10.py
index aee7d75bd3..58e0f4c33b 100644
--- a/tools/skp/page_sets/skia_frantzen_nexus10.py
+++ b/tools/skp/page_sets/skia_frantzen_nexus10.py
@@ -41,4 +41,4 @@ class SkiaFrantzenNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
index 11efd8d492..46de457c61 100644
--- a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
+++ b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
@@ -38,4 +38,4 @@ class SkiaGamedeksiamNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_gmail_nexus10.py b/tools/skp/page_sets/skia_gmail_nexus10.py
index 58be388703..825d6619b1 100644
--- a/tools/skp/page_sets/skia_gmail_nexus10.py
+++ b/tools/skp/page_sets/skia_gmail_nexus10.py
@@ -42,4 +42,4 @@ class SkiaGmailNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_gmailthread_desktop.py b/tools/skp/page_sets/skia_gmailthread_desktop.py
index c3327fa9ed..076948c15c 100644
--- a/tools/skp/page_sets/skia_gmailthread_desktop.py
+++ b/tools/skp/page_sets/skia_gmailthread_desktop.py
@@ -42,4 +42,4 @@ class SkiaGmailthreadDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_googleblog_nexus10.py b/tools/skp/page_sets/skia_googleblog_nexus10.py
index 67d84cee4c..21580277bd 100644
--- a/tools/skp/page_sets/skia_googleblog_nexus10.py
+++ b/tools/skp/page_sets/skia_googleblog_nexus10.py
@@ -38,4 +38,4 @@ class SkiaGoogleblogNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_googlecalendar_nexus10.py b/tools/skp/page_sets/skia_googlecalendar_nexus10.py
index 895ad96256..a905c489cd 100644
--- a/tools/skp/page_sets/skia_googlecalendar_nexus10.py
+++ b/tools/skp/page_sets/skia_googlecalendar_nexus10.py
@@ -39,4 +39,4 @@ class SkiaGooglecalendarNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_googlehome_desktop.py b/tools/skp/page_sets/skia_googlehome_desktop.py
index 84c611638d..d683d44f89 100644
--- a/tools/skp/page_sets/skia_googlehome_desktop.py
+++ b/tools/skp/page_sets/skia_googlehome_desktop.py
@@ -38,4 +38,4 @@ class SkiaGooglehomeDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_googleplus_desktop.py b/tools/skp/page_sets/skia_googleplus_desktop.py
index 8986dad1c8..6d4867799c 100644
--- a/tools/skp/page_sets/skia_googleplus_desktop.py
+++ b/tools/skp/page_sets/skia_googleplus_desktop.py
@@ -38,4 +38,4 @@ class SkiaGoogleplusDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
index 2db221446b..841feb02be 100644
--- a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
@@ -35,4 +35,4 @@ class SkiaGooglespreadsheetDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
index 39195387f7..235ee44b83 100644
--- a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
@@ -40,4 +40,4 @@ class SkiaGooglespreadsheetdashedDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_gspro_nexus10.py b/tools/skp/page_sets/skia_gspro_nexus10.py
index 188d6d23d6..1bbe423070 100644
--- a/tools/skp/page_sets/skia_gspro_nexus10.py
+++ b/tools/skp/page_sets/skia_gspro_nexus10.py
@@ -38,4 +38,4 @@ class SkiaGsproNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_gws_desktop.py b/tools/skp/page_sets/skia_gws_desktop.py
index 2969fe4bd8..47db8e9ddb 100644
--- a/tools/skp/page_sets/skia_gws_desktop.py
+++ b/tools/skp/page_sets/skia_gws_desktop.py
@@ -41,4 +41,4 @@ class SkiaGwsDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_hsfi_nexus10.py b/tools/skp/page_sets/skia_hsfi_nexus10.py
index 7f38c166c6..b8694cf91b 100644
--- a/tools/skp/page_sets/skia_hsfi_nexus10.py
+++ b/tools/skp/page_sets/skia_hsfi_nexus10.py
@@ -38,4 +38,4 @@ class SkiaHsfiNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
index 6892575571..e0cb0af338 100644
--- a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
@@ -38,4 +38,4 @@ class SkiaJsfiddlebigcarDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py b/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
index bb96267f7e..9aab8e2ca2 100644
--- a/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
@@ -41,4 +41,4 @@ class SkiaJsfiddlehumperclipDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_linkedin_desktop.py b/tools/skp/page_sets/skia_linkedin_desktop.py
index 6a7aa6b145..04bcf55be5 100644
--- a/tools/skp/page_sets/skia_linkedin_desktop.py
+++ b/tools/skp/page_sets/skia_linkedin_desktop.py
@@ -38,4 +38,4 @@ class SkiaLinkedinDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_mapsvg_desktop.py b/tools/skp/page_sets/skia_mapsvg_desktop.py
index 4e3f9276c4..5daa18c009 100644
--- a/tools/skp/page_sets/skia_mapsvg_desktop.py
+++ b/tools/skp/page_sets/skia_mapsvg_desktop.py
@@ -35,4 +35,4 @@ class SkiaMapsvgDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_mlb_nexus10.py b/tools/skp/page_sets/skia_mlb_nexus10.py
index 239b15538c..d43af5b4a9 100644
--- a/tools/skp/page_sets/skia_mlb_nexus10.py
+++ b/tools/skp/page_sets/skia_mlb_nexus10.py
@@ -38,4 +38,4 @@ class SkiaMlbNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_mobilenews_desktop.py b/tools/skp/page_sets/skia_mobilenews_desktop.py
index 50db2e6a81..435d5c8ee9 100644
--- a/tools/skp/page_sets/skia_mobilenews_desktop.py
+++ b/tools/skp/page_sets/skia_mobilenews_desktop.py
@@ -38,4 +38,4 @@ class SkiaMobilenewsDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_mozilla_nexus10.py b/tools/skp/page_sets/skia_mozilla_nexus10.py
index 7dc9aa78d2..d77bbdbda0 100644
--- a/tools/skp/page_sets/skia_mozilla_nexus10.py
+++ b/tools/skp/page_sets/skia_mozilla_nexus10.py
@@ -38,4 +38,4 @@ class SkiaMozillaNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_nofolo_nexus10.py b/tools/skp/page_sets/skia_nofolo_nexus10.py
index 86346f5863..a7caa7aa1f 100644
--- a/tools/skp/page_sets/skia_nofolo_nexus10.py
+++ b/tools/skp/page_sets/skia_nofolo_nexus10.py
@@ -38,4 +38,4 @@ class SkiaNofoloNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_nytimes_nexus10.py b/tools/skp/page_sets/skia_nytimes_nexus10.py
index fa2193747f..3d015d1baf 100644
--- a/tools/skp/page_sets/skia_nytimes_nexus10.py
+++ b/tools/skp/page_sets/skia_nytimes_nexus10.py
@@ -38,4 +38,4 @@ class SkiaNytimesNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_pinterest_desktop.py b/tools/skp/page_sets/skia_pinterest_desktop.py
index 528083decd..110eacf6e5 100644
--- a/tools/skp/page_sets/skia_pinterest_desktop.py
+++ b/tools/skp/page_sets/skia_pinterest_desktop.py
@@ -38,4 +38,4 @@ class SkiaPinterestDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_pokemonwiki_desktop.py b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
index 5896a23052..7c34133853 100644
--- a/tools/skp/page_sets/skia_pokemonwiki_desktop.py
+++ b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
@@ -38,4 +38,4 @@ class SkiaPokemonwikiDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_pravda_nexus10.py b/tools/skp/page_sets/skia_pravda_nexus10.py
index 5c2dbf3899..66d93d46de 100644
--- a/tools/skp/page_sets/skia_pravda_nexus10.py
+++ b/tools/skp/page_sets/skia_pravda_nexus10.py
@@ -38,4 +38,4 @@ class SkiaPravdaNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_sahadan_nexus10.py b/tools/skp/page_sets/skia_sahadan_nexus10.py
index 54afd0f973..681b9035fa 100644
--- a/tools/skp/page_sets/skia_sahadan_nexus10.py
+++ b/tools/skp/page_sets/skia_sahadan_nexus10.py
@@ -38,4 +38,4 @@ class SkiaSahadanNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_samoasvg_desktop.py b/tools/skp/page_sets/skia_samoasvg_desktop.py
index d4cff7bf37..965a73224b 100644
--- a/tools/skp/page_sets/skia_samoasvg_desktop.py
+++ b/tools/skp/page_sets/skia_samoasvg_desktop.py
@@ -39,4 +39,4 @@ class SkiaSamoasvgDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_sfgate_desktop.py b/tools/skp/page_sets/skia_sfgate_desktop.py
index 942f8a5e8f..be209bfcea 100644
--- a/tools/skp/page_sets/skia_sfgate_desktop.py
+++ b/tools/skp/page_sets/skia_sfgate_desktop.py
@@ -38,4 +38,4 @@ class SkiaSfgateDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_silkfinance_desktop.py b/tools/skp/page_sets/skia_silkfinance_desktop.py
index f0e7f13563..d6528f8e3d 100644
--- a/tools/skp/page_sets/skia_silkfinance_desktop.py
+++ b/tools/skp/page_sets/skia_silkfinance_desktop.py
@@ -38,4 +38,4 @@ class SkiaSilkfinanceDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_slashdot_nexus10.py b/tools/skp/page_sets/skia_slashdot_nexus10.py
index b86ee4fd85..db595b2f3e 100644
--- a/tools/skp/page_sets/skia_slashdot_nexus10.py
+++ b/tools/skp/page_sets/skia_slashdot_nexus10.py
@@ -38,4 +38,4 @@ class SkiaSlashdotNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_techmeme_nexus10.py b/tools/skp/page_sets/skia_techmeme_nexus10.py
index 9e67ac9a01..3d68a6bb87 100644
--- a/tools/skp/page_sets/skia_techmeme_nexus10.py
+++ b/tools/skp/page_sets/skia_techmeme_nexus10.py
@@ -38,4 +38,4 @@ class SkiaTechmemeNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_tigersvg_desktop.py b/tools/skp/page_sets/skia_tigersvg_desktop.py
index 126e014987..c627cee910 100644
--- a/tools/skp/page_sets/skia_tigersvg_desktop.py
+++ b/tools/skp/page_sets/skia_tigersvg_desktop.py
@@ -39,4 +39,4 @@ class SkiaTigersvgDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_transformice_nexus10.py b/tools/skp/page_sets/skia_transformice_nexus10.py
index 028c84e4e5..f55793096d 100644
--- a/tools/skp/page_sets/skia_transformice_nexus10.py
+++ b/tools/skp/page_sets/skia_transformice_nexus10.py
@@ -41,4 +41,4 @@ class SkiaTransformiceNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_twitter_desktop.py b/tools/skp/page_sets/skia_twitter_desktop.py
index 6e529e4d26..c3eadf04c7 100644
--- a/tools/skp/page_sets/skia_twitter_desktop.py
+++ b/tools/skp/page_sets/skia_twitter_desktop.py
@@ -38,4 +38,4 @@ class SkiaTwitterDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_ukwsj_nexus10.py b/tools/skp/page_sets/skia_ukwsj_nexus10.py
index 302b9fff78..02db04463e 100644
--- a/tools/skp/page_sets/skia_ukwsj_nexus10.py
+++ b/tools/skp/page_sets/skia_ukwsj_nexus10.py
@@ -38,4 +38,4 @@ class SkiaUkwsjNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_weather_desktop.py b/tools/skp/page_sets/skia_weather_desktop.py
index 81271818f8..7d91161ede 100644
--- a/tools/skp/page_sets/skia_weather_desktop.py
+++ b/tools/skp/page_sets/skia_weather_desktop.py
@@ -38,4 +38,4 @@ class SkiaWeatherDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_wordpress_desktop.py b/tools/skp/page_sets/skia_wordpress_desktop.py
index dea9eb7f98..3b48f12394 100644
--- a/tools/skp/page_sets/skia_wordpress_desktop.py
+++ b/tools/skp/page_sets/skia_wordpress_desktop.py
@@ -39,4 +39,4 @@ class SkiaWordpressDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_worldjournal_nexus10.py b/tools/skp/page_sets/skia_worldjournal_nexus10.py
index 8c8081243b..42abb96733 100644
--- a/tools/skp/page_sets/skia_worldjournal_nexus10.py
+++ b/tools/skp/page_sets/skia_worldjournal_nexus10.py
@@ -34,4 +34,4 @@ class SkiaWorldjournalNexus10PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_wowwiki_desktop.py b/tools/skp/page_sets/skia_wowwiki_desktop.py
index 495dffb9fc..d825e76ec6 100644
--- a/tools/skp/page_sets/skia_wowwiki_desktop.py
+++ b/tools/skp/page_sets/skia_wowwiki_desktop.py
@@ -38,4 +38,4 @@ class SkiaWowwikiDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_yahooanswers_desktop.py b/tools/skp/page_sets/skia_yahooanswers_desktop.py
index acb5d0e904..820ca8afc8 100644
--- a/tools/skp/page_sets/skia_yahooanswers_desktop.py
+++ b/tools/skp/page_sets/skia_yahooanswers_desktop.py
@@ -38,4 +38,4 @@ class SkiaYahooanswersDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_youtube_desktop.py b/tools/skp/page_sets/skia_youtube_desktop.py
index 9fbb74e9b8..335dc68fa1 100644
--- a/tools/skp/page_sets/skia_youtube_desktop.py
+++ b/tools/skp/page_sets/skia_youtube_desktop.py
@@ -38,4 +38,4 @@ class SkiaYoutubeDesktopPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(SkiaBuildbotDesktopPage(url, self))
+      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))