* Add nytimes_desktop pageset.

* Delete cuteoverload, frantzen, transformice and nytimes_tabl.
* Increase wait time for forecastio.

BUG=skia:3320
NOTRY=true
NOTREECHECKS=true

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

5 files changed, 7 insertions, 136 deletions

diff --git a/tools/skp/page_sets/skia_cuteoverload_nexus10.py b/tools/skp/page_sets/skia_cuteoverload_nexus10.py
deleted file mode 100644
index 12fc6255b0..0000000000
--- a/tools/skp/page_sets/skia_cuteoverload_nexus10.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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_cuteoverload_nexus10.json'
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
-
-
-class SkiaCuteoverloadNexus10PageSet(page_set_module.PageSet):
-
-  """ Pages designed to represent the median, not highly optimized web """
-
-  def __init__(self):
-    super(SkiaCuteoverloadNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
-      archive_data_file='data/skia_cuteoverload_nexus10.json')
-
-    urls_list = [
-      # Why: for Clank CY.
-      'http://cuteoverload.com/',
-    ]
-
-    for url in urls_list:
-      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 34cee15992..e1356fe76a 100644
--- a/tools/skp/page_sets/skia_forecastio_desktop.py
+++ b/tools/skp/page_sets/skia_forecastio_desktop.py
@@ -20,7 +20,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
+    action_runner.Wait(15)
 
 
 class SkiaForecastioDesktopPageSet(page_set_module.PageSet):
diff --git a/tools/skp/page_sets/skia_frantzen_nexus10.py b/tools/skp/page_sets/skia_frantzen_nexus10.py
deleted file mode 100644
index 58e0f4c33b..0000000000
--- a/tools/skp/page_sets/skia_frantzen_nexus10.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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_frantzen_nexus10.json'
-
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
-
-class SkiaFrantzenNexus10PageSet(page_set_module.PageSet):
-
-  """ Pages designed to represent the median, not highly optimized web """
-
-  def __init__(self):
-    super(SkiaFrantzenNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
-      archive_data_file='data/skia_frantzen_nexus10.json')
-
-    urls_list = [
-      # Why: http://code.google.com/p/chromium/issues/detail?id=136555
-      'http://www.frantzen-lindeberg.com/se/',
-    ]
-
-    for url in urls_list:
-      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))
diff --git a/tools/skp/page_sets/skia_nytimes_nexus10.py b/tools/skp/page_sets/skia_nytimes_desktop.py
index 3d015d1baf..d8f9ed7f08 100644
--- a/tools/skp/page_sets/skia_nytimes_nexus10.py
+++ b/tools/skp/page_sets/skia_nytimes_desktop.py
@@ -15,22 +15,22 @@ class SkiaBuildbotDesktopPage(page_module.Page):
         url=url,
         page_set=page_set,
         credentials_path='data/credentials.json')
-    self.user_agent_type = 'tablet'
-    self.archive_data_file = 'data/skia_nytimes_nexus10.json'
+    self.user_agent_type = 'desktop'
+    self.archive_data_file = 'data/skia_nytimes_desktop.json'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.Wait(15)
 
 
-class SkiaNytimesNexus10PageSet(page_set_module.PageSet):
+class SkiaNytimesDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaNytimesNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
-      archive_data_file='data/skia_nytimes_nexus10.json')
+    super(SkiaNytimesDesktopPageSet, self).__init__(
+      user_agent_type='desktop',
+      archive_data_file='data/skia_nytimes_desktop.json')
 
     urls_list = [
       # Why: for Clank CY
diff --git a/tools/skp/page_sets/skia_transformice_nexus10.py b/tools/skp/page_sets/skia_transformice_nexus10.py
deleted file mode 100644
index f55793096d..0000000000
--- a/tools/skp/page_sets/skia_transformice_nexus10.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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_transformice_nexus10.json'
-
-  def RunSmoothness(self, action_runner):
-    action_runner.ScrollElement()
-
-  def RunNavigateSteps(self, action_runner):
-    action_runner.NavigateToPage(self)
-    action_runner.Wait(15)
-
-
-class SkiaTransformiceNexus10PageSet(page_set_module.PageSet):
-
-  """ Pages designed to represent the median, not highly optimized web """
-
-  def __init__(self):
-    super(SkiaTransformiceNexus10PageSet, self).__init__(
-      user_agent_type='tablet',
-      archive_data_file='data/skia_transformice_nexus10.json')
-
-    urls_list = [
-      # Why: From Tom W's list.
-      'http://www.transformice.com/',
-    ]
-
-    for url in urls_list:
-      self.AddUserStory(SkiaBuildbotDesktopPage(url, self))