Updated all page sets to capture new set of webpage archives.

Fixed the record_wpr retry mechanism in webpages_playback.py.

Updated all page sets to remove the no longer needed RunSmoothness and RunNavigateSteps.

Updated the key_silk_cases pagesets to point to a non svn location:
* skia_fontwipe_desktop.py
* skia_silkfinance_desktop.py

Removed mercurynews, record_wpr was timing out because of a popup.

Added back the following pagesets which were previously disabled but are now working again:
* skia_cnn_nexus10.py
* skia_wordpress_desktop.py
* skia_transformice_nexus10.py

BUG=skia:3049

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

64 files changed, 73 insertions, 463 deletions

diff --git a/tools/skp/page_sets/other/FAILING-skia_cnn_nexus10.json b/tools/skp/page_sets/other/FAILING-skia_cnn_nexus10.json
deleted file mode 100644
index 77b2851f96..0000000000
--- a/tools/skp/page_sets/other/FAILING-skia_cnn_nexus10.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "description": "CNN for Skia for Nexus10.",
-    "archive_data_file": "data/skia_cnn_nexus10.json",
-    "credentials_path": "data/credentials.json",
-    "user_agent_type": "tablet",
-    "smoothness": { "action": "scroll" },
-    "pages": [
-        {
-            "url": "http://www.cnn.com/2012/10/03/politics/michelle-obama-debate/index.html",
-            "why": "#2 news worldwide",
-            "navigate_steps" : [
-               { "action": "navigate" },
-               { "action": "wait", "seconds": 15 }
-            ]
-        }
-    ]
-}
diff --git a/tools/skp/page_sets/other/FAILING-skia_wordpress_desktop.json b/tools/skp/page_sets/other/FAILING-skia_wordpress_desktop.json
deleted file mode 100644
index a671a5932b..0000000000
--- a/tools/skp/page_sets/other/FAILING-skia_wordpress_desktop.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "description": "Wordpress for Skia Desktop.",
-    "archive_data_file": "data/skia_wordpress_desktop.json",
-    "credentials_path": "data/credentials.json",
-    "smoothness": { "action": "scroll" },
-    "pages": [
-        {
-            "name": "Wordpress",
-            "url": "http://en.blog.wordpress.com/2012/09/04/freshly-pressed-editors-picks-for-august-2012/",
-            "why": "#18 (Alexa global), Picked an interesting post",
-            "navigate_steps" : [                                                
-               { "action": "navigate" },                                        
-               { "action": "wait", "seconds": 5 }                               
-            ]
-        }
-    ]
-}
diff --git a/tools/skp/page_sets/skia_mercurynews_nexus10.py b/tools/skp/page_sets/other/POPUP-skia_mercurynews_nexus10.json
index 91eadbc2f8..1c2166670d 100644
--- a/tools/skp/page_sets/skia_mercurynews_nexus10.py
+++ b/tools/skp/page_sets/other/POPUP-skia_mercurynews_nexus10.json
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_mercurynews_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaMercurynewsNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/other/TIMINGOUT-skia_transformice_nexus10.json b/tools/skp/page_sets/other/TIMINGOUT-skia_transformice_nexus10.json
deleted file mode 100644
index 4f292606bf..0000000000
--- a/tools/skp/page_sets/other/TIMINGOUT-skia_transformice_nexus10.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "description": "Transformice for Skia for Nexus10.",
-    "archive_path": "data/skia_transformice_nexus10.wpr",
-    "credentials_path": "data/credentials.json",
-    "user_agent_type": "nexus10",
-    "pages": [
-        {
-            "url": "http://www.transformice.com/",
-            "wait_time_after_navigate": 30.0,
-            "why": "from Tom W's list"
-        }
-    ]
-}
diff --git a/tools/skp/page_sets/skia_amazon_desktop.py b/tools/skp/page_sets/skia_amazon_desktop.py
index d6e47d1ba8..6ccf0a6ad7 100644
--- a/tools/skp/page_sets/skia_amazon_desktop.py
+++ b/tools/skp/page_sets/skia_amazon_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_amazon_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaAmazonDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_androidpolice_nexus10.py b/tools/skp/page_sets/skia_androidpolice_nexus10.py
index f121b6e304..5f156ea650 100644
--- a/tools/skp/page_sets/skia_androidpolice_nexus10.py
+++ b/tools/skp/page_sets/skia_androidpolice_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_androidpolice_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaAndroidpoliceNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_baidu_desktop.py b/tools/skp/page_sets/skia_baidu_desktop.py
index df11d6c5c7..c7baa24b7a 100644
--- a/tools/skp/page_sets/skia_baidu_desktop.py
+++ b/tools/skp/page_sets/skia_baidu_desktop.py
@@ -18,12 +18,9 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_baidu_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.Wait(60)
+    action_runner.Wait(90)
 
 
 class SkiaBaiduDesktopPageSet(page_set_module.PageSet):
diff --git a/tools/skp/page_sets/skia_blogger_desktop.py b/tools/skp/page_sets/skia_blogger_desktop.py
index 678d0b1750..ad914eb071 100644
--- a/tools/skp/page_sets/skia_blogger_desktop.py
+++ b/tools/skp/page_sets/skia_blogger_desktop.py
@@ -18,14 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_blogger_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(60)
-
 
 class SkiaBloggerDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_booking_desktop.py b/tools/skp/page_sets/skia_booking_desktop.py
index 7f551a13c5..70764edce8 100644
--- a/tools/skp/page_sets/skia_booking_desktop.py
+++ b/tools/skp/page_sets/skia_booking_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_booking_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaBookingDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_carsvg_desktop.py b/tools/skp/page_sets/skia_carsvg_desktop.py
index 825d62b5b3..b2ed3227e1 100644
--- a/tools/skp/page_sets/skia_carsvg_desktop.py
+++ b/tools/skp/page_sets/skia_carsvg_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_carsvg_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaCarsvgDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_chalkboard_desktop.py b/tools/skp/page_sets/skia_chalkboard_desktop.py
index 2980690049..61be87c473 100644
--- a/tools/skp/page_sets/skia_chalkboard_desktop.py
+++ b/tools/skp/page_sets/skia_chalkboard_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_chalkboard_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaChalkboardDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_cnet_nexus10.py b/tools/skp/page_sets/skia_cnet_nexus10.py
index 35e6c32481..2c57a91b8f 100644
--- a/tools/skp/page_sets/skia_cnet_nexus10.py
+++ b/tools/skp/page_sets/skia_cnet_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_cnet_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaCnetNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_cnn_nexus10.py b/tools/skp/page_sets/skia_cnn_nexus10.py
new file mode 100644
index 0000000000..90aa26c3e9
--- /dev/null
+++ b/tools/skp/page_sets/skia_cnn_nexus10.py
@@ -0,0 +1,37 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+# pylint: disable=W0401,W0614
+
+
+from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
+
+
+class SkiaBuildbotDesktopPage(page_module.Page):
+
+  def __init__(self, url, page_set):
+    super(SkiaBuildbotDesktopPage, self).__init__(
+        url=url,
+        page_set=page_set,
+        credentials_path='data/credentials.json')
+    self.user_agent_type = 'tablet'
+    self.archive_data_file = 'data/skia_cnn_nexus10.json'
+
+
+class SkiaCnnNexus10PageSet(page_set_module.PageSet):
+
+  """ Pages designed to represent the median, not highly optimized web """
+
+  def __init__(self):
+    super(SkiaCnnNexus10PageSet, self).__init__(
+      user_agent_type='tablet',
+      archive_data_file='data/skia_cnn_nexus10.json')
+
+    urls_list = [
+      # Why: #2 news worldwide.
+      'http://www.cnn.com/2012/10/03/politics/michelle-obama-debate/index.html',
+    ]
+
+    for url in urls_list:
+      self.AddPage(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..cceada45b2 100644
--- a/tools/skp/page_sets/skia_css3gradients_desktop.py
+++ b/tools/skp/page_sets/skia_css3gradients_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_css3gradients_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaCss3gradientsDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_cuteoverload_nexus10.py b/tools/skp/page_sets/skia_cuteoverload_nexus10.py
index 8332074594..74a9c26249 100644
--- a/tools/skp/page_sets/skia_cuteoverload_nexus10.py
+++ b/tools/skp/page_sets/skia_cuteoverload_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_cuteoverload_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaCuteoverloadNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_deviantart_nexus10.py b/tools/skp/page_sets/skia_deviantart_nexus10.py
index c645af75b4..7e7806f741 100644
--- a/tools/skp/page_sets/skia_deviantart_nexus10.py
+++ b/tools/skp/page_sets/skia_deviantart_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_deviantart_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaDeviantartNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_digg_nexus10.py b/tools/skp/page_sets/skia_digg_nexus10.py
index bd44785e64..d63701fb6f 100644
--- a/tools/skp/page_sets/skia_digg_nexus10.py
+++ b/tools/skp/page_sets/skia_digg_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_digg_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaDiggNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_ebay_desktop.py b/tools/skp/page_sets/skia_ebay_desktop.py
index 7fc30fab3f..4828e32d28 100644
--- a/tools/skp/page_sets/skia_ebay_desktop.py
+++ b/tools/skp/page_sets/skia_ebay_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_ebay_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaEbayDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_engadget_nexus10.py b/tools/skp/page_sets/skia_engadget_nexus10.py
index 20e1b79b1a..69d95682d7 100644
--- a/tools/skp/page_sets/skia_engadget_nexus10.py
+++ b/tools/skp/page_sets/skia_engadget_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_engadget_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaEngadgetNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_espn_desktop.py b/tools/skp/page_sets/skia_espn_desktop.py
index 433e2a2f75..c8d53613e7 100644
--- a/tools/skp/page_sets/skia_espn_desktop.py
+++ b/tools/skp/page_sets/skia_espn_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_espn_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaEspnDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_facebook_desktop.py b/tools/skp/page_sets/skia_facebook_desktop.py
index c72e57ef13..d212eb653f 100644
--- a/tools/skp/page_sets/skia_facebook_desktop.py
+++ b/tools/skp/page_sets/skia_facebook_desktop.py
@@ -25,7 +25,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
+    action_runner.Wait(15)
 
 
 class SkiaFacebookDesktopPageSet(page_set_module.PageSet):
diff --git a/tools/skp/page_sets/skia_fontwipe_desktop.py b/tools/skp/page_sets/skia_fontwipe_desktop.py
index a832a5a916..9a6a091808 100644
--- a/tools/skp/page_sets/skia_fontwipe_desktop.py
+++ b/tools/skp/page_sets/skia_fontwipe_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_fontwipe_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaFontwipeDesktopPageSet(page_set_module.PageSet):
 
@@ -37,8 +30,7 @@ class SkiaFontwipeDesktopPageSet(page_set_module.PageSet):
 
     urls_list = [
       # Why: Page from Chromium's silk test cases.
-      ('http://src.chromium.org/chrome/trunk/src/tools/perf/page_sets/'
-       'key_silk_cases/font_wipe.html'),
+      'http://jsfiddle.net/u324ffkq/embedded/result/',
     ]
 
     for url in urls_list:
diff --git a/tools/skp/page_sets/skia_forecastio_desktop.py b/tools/skp/page_sets/skia_forecastio_desktop.py
index 08c523ac74..e33b088227 100644
--- a/tools/skp/page_sets/skia_forecastio_desktop.py
+++ b/tools/skp/page_sets/skia_forecastio_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_forecastio_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(20)
-
 
 class SkiaForecastioDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
index fcef0e1d49..65d37c0199 100644
--- a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
+++ b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_gamedeksiam_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaGamedeksiamNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_gmailthread_desktop.py b/tools/skp/page_sets/skia_gmailthread_desktop.py
index ec13eccc7d..c3327fa9ed 100644
--- a/tools/skp/page_sets/skia_gmailthread_desktop.py
+++ b/tools/skp/page_sets/skia_gmailthread_desktop.py
@@ -24,7 +24,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.Wait(60)
+    action_runner.Wait(15)
 
 
 class SkiaGmailthreadDesktopPageSet(page_set_module.PageSet):
diff --git a/tools/skp/page_sets/skia_googleblog_nexus10.py b/tools/skp/page_sets/skia_googleblog_nexus10.py
index db06eefb88..b0b939059e 100644
--- a/tools/skp/page_sets/skia_googleblog_nexus10.py
+++ b/tools/skp/page_sets/skia_googleblog_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_googleblog_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaGoogleblogNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_googlecalendar_nexus10.py b/tools/skp/page_sets/skia_googlecalendar_nexus10.py
index 5e899b5778..650a896b5a 100644
--- a/tools/skp/page_sets/skia_googlecalendar_nexus10.py
+++ b/tools/skp/page_sets/skia_googlecalendar_nexus10.py
@@ -19,13 +19,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.archive_data_file = 'data/skia_googlecalendar_nexus10.json'
     self.credentials = 'google'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaGooglecalendarNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_googlehome_desktop.py b/tools/skp/page_sets/skia_googlehome_desktop.py
index 8187a44830..b2f1b2650d 100644
--- a/tools/skp/page_sets/skia_googlehome_desktop.py
+++ b/tools/skp/page_sets/skia_googlehome_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_googlehome_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaGooglehomeDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_googleplus_desktop.py b/tools/skp/page_sets/skia_googleplus_desktop.py
index 78775dfb9a..aaeb94edac 100644
--- a/tools/skp/page_sets/skia_googleplus_desktop.py
+++ b/tools/skp/page_sets/skia_googleplus_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_googleplus_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaGoogleplusDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
index 0bbf0fc514..2db221446b 100644
--- a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_googlespreadsheet_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(10)
-
 
 class SkiaGooglespreadsheetDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
index deea590c02..3ed1e0b9c3 100644
--- a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
@@ -17,14 +17,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         credentials_path='data/credentials.json')
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_googlespreadsheetdashed_desktop.json'
-
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(10)
+    self.credentials = 'google'
 
 
 class SkiaGooglespreadsheetdashedDesktopPageSet(page_set_module.PageSet):
@@ -38,8 +31,8 @@ class SkiaGooglespreadsheetdashedDesktopPageSet(page_set_module.PageSet):
 
     urls_list = [
       # Why: from Tom W's list.
-      ('https://docs.google.com/spreadsheet/ccc?'
-       'key=0ApnDjttF0gt9dGpRM0labXFaT3ExSFhWZWstR3dQSWc#gid=0'),
+      ('https://docs.google.com/spreadsheet/ccc?key='
+       '0ApnDjttF0gt9dGpRM0labXFaT3ExSFhWZWstR3dQSWc#gid=0'),
     ]
 
     for url in urls_list:
diff --git a/tools/skp/page_sets/skia_gspro_nexus10.py b/tools/skp/page_sets/skia_gspro_nexus10.py
index 97c0ec43f9..eedcee1790 100644
--- a/tools/skp/page_sets/skia_gspro_nexus10.py
+++ b/tools/skp/page_sets/skia_gspro_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_gspro_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaGsproNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_gws_desktop.py b/tools/skp/page_sets/skia_gws_desktop.py
index 864a8f7d0b..2969fe4bd8 100644
--- a/tools/skp/page_sets/skia_gws_desktop.py
+++ b/tools/skp/page_sets/skia_gws_desktop.py
@@ -23,7 +23,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
+    action_runner.Wait(15)
 
 
 class SkiaGwsDesktopPageSet(page_set_module.PageSet):
diff --git a/tools/skp/page_sets/skia_hsfi_nexus10.py b/tools/skp/page_sets/skia_hsfi_nexus10.py
index bf4c4fec80..7e6dc9f6f8 100644
--- a/tools/skp/page_sets/skia_hsfi_nexus10.py
+++ b/tools/skp/page_sets/skia_hsfi_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_hsfi_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaHsfiNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
index 3ac769dbfa..88f82fc6fa 100644
--- a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_jsfiddlebigcar_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(10)
-
 
 class SkiaJsfiddlebigcarDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py b/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
index d85699e592..bb96267f7e 100644
--- a/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
@@ -23,7 +23,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.Wait(10)
+    action_runner.Wait(15)
 
 
 class SkiaJsfiddlehumperclipDesktopPageSet(page_set_module.PageSet):
diff --git a/tools/skp/page_sets/skia_linkedin_desktop.py b/tools/skp/page_sets/skia_linkedin_desktop.py
index 3e52d5ef26..2772381ddc 100644
--- a/tools/skp/page_sets/skia_linkedin_desktop.py
+++ b/tools/skp/page_sets/skia_linkedin_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_linkedin_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaLinkedinDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_mapsvg_desktop.py b/tools/skp/page_sets/skia_mapsvg_desktop.py
index 877c8179cb..4e3f9276c4 100644
--- a/tools/skp/page_sets/skia_mapsvg_desktop.py
+++ b/tools/skp/page_sets/skia_mapsvg_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_mapsvg_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(10)
-
 
 class SkiaMapsvgDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_mlb_nexus10.py b/tools/skp/page_sets/skia_mlb_nexus10.py
index 2bb9613e14..d95eeed3bb 100644
--- a/tools/skp/page_sets/skia_mlb_nexus10.py
+++ b/tools/skp/page_sets/skia_mlb_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_mlb_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaMlbNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_mobilenews_desktop.py b/tools/skp/page_sets/skia_mobilenews_desktop.py
index 6e5c4b5c9d..e3572779c6 100644
--- a/tools/skp/page_sets/skia_mobilenews_desktop.py
+++ b/tools/skp/page_sets/skia_mobilenews_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_mobilenews_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(10)
-
 
 class SkiaMobilenewsDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_mozilla_nexus10.py b/tools/skp/page_sets/skia_mozilla_nexus10.py
index eb33e079ef..6da3902a12 100644
--- a/tools/skp/page_sets/skia_mozilla_nexus10.py
+++ b/tools/skp/page_sets/skia_mozilla_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_mozilla_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaMozillaNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_nofolo_nexus10.py b/tools/skp/page_sets/skia_nofolo_nexus10.py
index c7f7c648e5..bee73f1281 100644
--- a/tools/skp/page_sets/skia_nofolo_nexus10.py
+++ b/tools/skp/page_sets/skia_nofolo_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_nofolo_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaNofoloNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_nytimes_nexus10.py b/tools/skp/page_sets/skia_nytimes_nexus10.py
index 18d5732339..f50bddea97 100644
--- a/tools/skp/page_sets/skia_nytimes_nexus10.py
+++ b/tools/skp/page_sets/skia_nytimes_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_nytimes_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaNytimesNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_pinterest_desktop.py b/tools/skp/page_sets/skia_pinterest_desktop.py
index 780c2bf27d..f2d7be4257 100644
--- a/tools/skp/page_sets/skia_pinterest_desktop.py
+++ b/tools/skp/page_sets/skia_pinterest_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_pinterest_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaPinterestDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_pokemonwiki_desktop.py b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
index d96ac49113..47d5b31410 100644
--- a/tools/skp/page_sets/skia_pokemonwiki_desktop.py
+++ b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_pokemonwiki_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaPokemonwikiDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_pravda_nexus10.py b/tools/skp/page_sets/skia_pravda_nexus10.py
index 6daaa439d9..f0eddc3451 100644
--- a/tools/skp/page_sets/skia_pravda_nexus10.py
+++ b/tools/skp/page_sets/skia_pravda_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_pravda_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(10)
-
 
 class SkiaPravdaNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_sahadan_nexus10.py b/tools/skp/page_sets/skia_sahadan_nexus10.py
index f1b383004f..804fe0e141 100644
--- a/tools/skp/page_sets/skia_sahadan_nexus10.py
+++ b/tools/skp/page_sets/skia_sahadan_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_sahadan_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaSahadanNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_samoasvg_desktop.py b/tools/skp/page_sets/skia_samoasvg_desktop.py
index 817c821cc1..ff8b0a989b 100644
--- a/tools/skp/page_sets/skia_samoasvg_desktop.py
+++ b/tools/skp/page_sets/skia_samoasvg_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_samoasvg_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaSamoasvgDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_sfgate_desktop.py b/tools/skp/page_sets/skia_sfgate_desktop.py
index bcde7cc5a1..ccb0c85b02 100644
--- a/tools/skp/page_sets/skia_sfgate_desktop.py
+++ b/tools/skp/page_sets/skia_sfgate_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_sfgate_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaSfgateDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_oldinboxapp_desktop.py b/tools/skp/page_sets/skia_silkfinance_desktop.py
index 0c50851ff5..6a5872fa18 100644
--- a/tools/skp/page_sets/skia_oldinboxapp_desktop.py
+++ b/tools/skp/page_sets/skia_silkfinance_desktop.py
@@ -16,29 +16,21 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         page_set=page_set,
         credentials_path='data/credentials.json')
     self.user_agent_type = 'desktop'
-    self.archive_data_file = 'data/skia_oldinboxapp_desktop.json'
+    self.archive_data_file = 'data/skia_silkfinance_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
 
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
-
-class SkiaOldinboxappDesktopPageSet(page_set_module.PageSet):
+class SkiaSilkfinanceDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaOldinboxappDesktopPageSet, self).__init__(
+    super(SkiaSilkfinanceDesktopPageSet, self).__init__(
       user_agent_type='desktop',
-      archive_data_file='data/skia_oldinboxapp_desktop.json')
+      archive_data_file='data/skia_silkfinance_desktop.json')
 
     urls_list = [
       # Why: Page from Chromium's silk test cases
-      ('http://src.chromium.org/chrome/trunk/src/tools/perf/page_sets/'
-       'key_silk_cases/old_inbox_app.html'),
+      'http://jsfiddle.net/47ftse2x/embedded/result/',
     ]
 
     for url in urls_list:
diff --git a/tools/skp/page_sets/skia_slashdot_nexus10.py b/tools/skp/page_sets/skia_slashdot_nexus10.py
index ca5e1d2c9f..ae7fffcc60 100644
--- a/tools/skp/page_sets/skia_slashdot_nexus10.py
+++ b/tools/skp/page_sets/skia_slashdot_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_slashdot_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaSlashdotNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_techmeme_nexus10.py b/tools/skp/page_sets/skia_techmeme_nexus10.py
index a006b07c0c..aa1a04d6ef 100644
--- a/tools/skp/page_sets/skia_techmeme_nexus10.py
+++ b/tools/skp/page_sets/skia_techmeme_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_techmeme_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaTechmemeNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_tigersvg_desktop.py b/tools/skp/page_sets/skia_tigersvg_desktop.py
index 47ad95b1ef..39b0064480 100644
--- a/tools/skp/page_sets/skia_tigersvg_desktop.py
+++ b/tools/skp/page_sets/skia_tigersvg_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_tigersvg_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaTigersvgDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_youtubetvvideo_desktop.py b/tools/skp/page_sets/skia_transformice_nexus10.py
index d54bcfa221..028c84e4e5 100644
--- a/tools/skp/page_sets/skia_youtubetvvideo_desktop.py
+++ b/tools/skp/page_sets/skia_transformice_nexus10.py
@@ -15,29 +15,29 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         page_set=page_set,
         credentials_path='data/credentials.json')
-    self.user_agent_type = 'desktop'
-    self.archive_data_file = 'data/skia_youtubetvvideo_desktop.json'
+    self.user_agent_type = 'tablet'
+    self.archive_data_file = 'data/skia_transformice_nexus10.json'
 
   def RunSmoothness(self, action_runner):
     action_runner.ScrollElement()
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.Wait(10)
+    action_runner.Wait(15)
 
 
-class SkiaYoutubetvvideoDesktopPageSet(page_set_module.PageSet):
+class SkiaTransformiceNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaYoutubetvvideoDesktopPageSet, self).__init__(
-      user_agent_type='',
-      archive_data_file='data/skia_youtubetvvideo_desktop.json')
+    super(SkiaTransformiceNexus10PageSet, self).__init__(
+      user_agent_type='tablet',
+      archive_data_file='data/skia_transformice_nexus10.json')
 
     urls_list = [
-      # Why: from bsalomon
-      'https://www.youtube.com/tv#/watch?v=046MuD1pYJg&mode=transport',
+      # Why: From Tom W's list.
+      'http://www.transformice.com/',
     ]
 
     for url in urls_list:
diff --git a/tools/skp/page_sets/skia_twitter_desktop.py b/tools/skp/page_sets/skia_twitter_desktop.py
index bcdccf8067..c1061d8cca 100644
--- a/tools/skp/page_sets/skia_twitter_desktop.py
+++ b/tools/skp/page_sets/skia_twitter_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_twitter_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaTwitterDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_ukwsj_nexus10.py b/tools/skp/page_sets/skia_ukwsj_nexus10.py
index 2fe938ac4a..3158a30115 100644
--- a/tools/skp/page_sets/skia_ukwsj_nexus10.py
+++ b/tools/skp/page_sets/skia_ukwsj_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_ukwsj_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaUkwsjNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_vnexpress_nexus10.py b/tools/skp/page_sets/skia_vnexpress_nexus10.py
index a820d1265f..54fc164ffe 100644
--- a/tools/skp/page_sets/skia_vnexpress_nexus10.py
+++ b/tools/skp/page_sets/skia_vnexpress_nexus10.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'tablet'
     self.archive_data_file = 'data/skia_vnexpress_nexus10.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaVnexpressNexus10PageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_weather_desktop.py b/tools/skp/page_sets/skia_weather_desktop.py
index c8371819e4..b61cd332b4 100644
--- a/tools/skp/page_sets/skia_weather_desktop.py
+++ b/tools/skp/page_sets/skia_weather_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_weather_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaWeatherDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_wikipedia_galaxynexus.py b/tools/skp/page_sets/skia_wikipedia_galaxynexus.py
index e0be4e9fff..049091a686 100644
--- a/tools/skp/page_sets/skia_wikipedia_galaxynexus.py
+++ b/tools/skp/page_sets/skia_wikipedia_galaxynexus.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'mobile'
     self.archive_data_file = 'data/skia_wikipedia_galaxynexus.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaWikipediaGalaxynexusPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_rectangletransition_desktop.py b/tools/skp/page_sets/skia_wordpress_desktop.py
index a3b21ac4b8..c8ba560d1d 100644
--- a/tools/skp/page_sets/skia_rectangletransition_desktop.py
+++ b/tools/skp/page_sets/skia_wordpress_desktop.py
@@ -16,29 +16,22 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         page_set=page_set,
         credentials_path='data/credentials.json')
     self.user_agent_type = 'desktop'
-    self.archive_data_file = 'data/skia_rectangletransition_desktop.json'
+    self.archive_data_file = 'data/skia_wordpress_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
 
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
-
-class SkiaRectangletransitionDesktopPageSet(page_set_module.PageSet):
+class SkiaWordpressDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaRectangletransitionDesktopPageSet, self).__init__(
+    super(SkiaWordpressDesktopPageSet, self).__init__(
       user_agent_type='desktop',
-      archive_data_file='data/skia_rectangletransition_desktop.json')
+      archive_data_file='data/skia_wordpress_desktop.json')
 
     urls_list = [
-      # Why: Page from Chromium's silk test cases
-      ('http://src.chromium.org/chrome/trunk/src/tools/perf/page_sets/'
-       'key_silk_cases/rectangle_transition.html'),
+      # Why: #18 (Alexa global), Picked an interesting post.
+      ('http://en.blog.wordpress.com/2012/09/04/'
+       'freshly-pressed-editors-picks-for-august-2012/'),
     ]
 
     for url in urls_list:
diff --git a/tools/skp/page_sets/skia_wowwiki_desktop.py b/tools/skp/page_sets/skia_wowwiki_desktop.py
index 0acc80403d..edc2656d55 100644
--- a/tools/skp/page_sets/skia_wowwiki_desktop.py
+++ b/tools/skp/page_sets/skia_wowwiki_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_wowwiki_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaWowwikiDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_yahooanswers_desktop.py b/tools/skp/page_sets/skia_yahooanswers_desktop.py
index 274ad43b3a..37fa484eb6 100644
--- a/tools/skp/page_sets/skia_yahooanswers_desktop.py
+++ b/tools/skp/page_sets/skia_yahooanswers_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_yahooanswers_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
 
 class SkiaYahooanswersDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/page_sets/skia_youtube_desktop.py b/tools/skp/page_sets/skia_youtube_desktop.py
index 7a81104bf2..be5e8187e9 100644
--- a/tools/skp/page_sets/skia_youtube_desktop.py
+++ b/tools/skp/page_sets/skia_youtube_desktop.py
@@ -18,13 +18,6 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/skia_youtube_desktop.json'
 
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
 
 class SkiaYoutubeDesktopPageSet(page_set_module.PageSet):
 
diff --git a/tools/skp/webpages_playback.py b/tools/skp/webpages_playback.py
index 97fec5172d..f884381c84 100644
--- a/tools/skp/webpages_playback.py
+++ b/tools/skp/webpages_playback.py
@@ -80,9 +80,6 @@ CREDENTIALS_FILE_PATH = os.path.join(
     'credentials.json'
 )
 
-# Stdout that signifies that a recording has failed.
-RECORD_FAILURE_MSG = 'The recording has not been updated for these pages.'
-
 # Name of the SKP benchmark
 SKP_BENCHMARK = 'skpicture_printer'
 
@@ -221,12 +218,13 @@ class SkPicturePlayback(object):
           '--page-set-base-dir=%s' % page_set_dir
         )
         for _ in range(RETRY_RECORD_WPR_COUNT):
-          output = shell_utils.run(' '.join(record_wpr_cmd), shell=True)
-          if RECORD_FAILURE_MSG in output:
-            print output
-          else:
+          try:
+            shell_utils.run(' '.join(record_wpr_cmd), shell=True)
             # Break out of the retry loop since there were no errors.
             break
+          except Exception:
+            # There was a failure continue with the loop.
+            traceback.print_exc()
         else:
           # If we get here then record_wpr did not succeed and thus did not
           # break out of the loop.
@@ -303,8 +301,7 @@ class SkPicturePlayback(object):
       for tools_cmd in (render_pictures_cmd, render_pdfs_cmd):
         print '\n\n=======Running %s=======' % ' '.join(tools_cmd)
         proc = subprocess.Popen(tools_cmd)
-        (code, output) = shell_utils.log_process_after_completion(proc,
-                                                                  echo=False)
+        (code, _) = shell_utils.log_process_after_completion(proc, echo=False)
         if code != 0:
           raise Exception('%s failed!' % ' '.join(tools_cmd))