Merge pathological_mobile_sites into rendering benchmarks

Move pathological_mobile_sites into the rendering folder and refactor to
inherit from the RenderingStory class

Bug: 849392
Change-Id: Ie34cda5845f73b133e9d1df34430eede20f2d670
Reviewed-on: https://chromium-review.googlesource.com/1089383
Commit-Queue: Amy Qiu <amyqiu@google.com>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#565686}

tools/perf/expectations.config

@@ -185,6 +185,17 @@ crbug.com/850295 [ All ] rendering.mobile/aquarium_20k [ Skip ]
 crbug.com/795060 [ Android_One ] rendering.mobile/extra_large_texture_uploads [ Skip ]
 crbug.com/780525 [ All ] rendering.mobile/polymer_topeka [ Skip ]
 crbug.com/461127 [ All ] rendering.mobile/famo_us_twitter_demo [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/cnn_pathological [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/espn_pathological [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/recode_pathological [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/yahoo_sports_pathological [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/latimes_pathological [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/pbs_pathological [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/guardian_pathological [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/wow_wiki_pathological [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/zdnet_pathological [ Skip ]
+crbug.com/685342 [ Nexus_7 ] rendering.mobile/linkedin_pathological [ Skip ]
+crbug.com/822925 [ Android_Webview ] rendering.mobile/yahoo_sports_pathological [ Skip ]
 
 # Benchmark: smoothness.gpu_rasterization.polymer
 [ All ] smoothness.gpu_rasterization.polymer/* [ Skip ] # Test needs to be modernized.

tools/perf/page_sets/data/rendering_mobile.json

@@ -770,6 +770,36 @@
         },
         "polymer_topeka": {
             "DEFAULT": "key_silk_cases_018.wprgo"
+	},
+	"cnn_pathological": {
+            "DEFAULT": "pathological_mobile_sites_000.wprgo"
+        },
+        "espn_pathological": {
+            "DEFAULT": "pathological_mobile_sites_000.wprgo"
+        },
+        "recode_pathological": {
+            "DEFAULT": "pathological_mobile_sites_000.wprgo"
+        },
+        "yahoo_sports_pathological": {
+            "DEFAULT": "pathological_mobile_sites_001.wprgo"
+        },
+        "latimes_pathological": {
+            "DEFAULT": "pathological_mobile_sites_000.wprgo"
+        },
+        "pbs_pathological": {
+            "DEFAULT": "pathological_mobile_sites_000.wprgo"
+        },
+        "guardian_pathological": {
+            "DEFAULT": "pathological_mobile_sites_010.wprgo"
+        },
+        "wow_wiki_pathological": {
+            "DEFAULT": "pathological_mobile_sites_008.wprgo"
+        },
+        "zdnet_pathological": {
+            "DEFAULT": "pathological_mobile_sites_000.wprgo"
+        },
+        "linkedin_pathological": {
+            "DEFAULT": "pathological_mobile_sites_009.wprgo"
         }
     },
     "description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.",

tools/perf/page_sets/pathological_mobile_sites.py

-# Copyright 2015 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.
-from telemetry.page import page as page_module
-from telemetry.page import shared_page_state
-from telemetry import story
-
-
-class PathologicalMobileSitesPage(page_module.Page):
-
-  def __init__(self, name, url, page_set):
-    super(PathologicalMobileSitesPage, self).__init__(
-        url=url, page_set=page_set,
-        shared_page_state_class=shared_page_state.SharedMobilePageState,
-        name=name)
-
-  def RunPageInteractions(self, action_runner):
-    with action_runner.CreateGestureInteraction('ScrollAction'):
-      action_runner.ScrollPage()
-
-
-class PathologicalMobileSitesPageSet(story.StorySet):
-
-  """Pathologically bad and janky sites on mobile."""
-
-  def __init__(self):
-    super(PathologicalMobileSitesPageSet, self).__init__(
-        archive_data_file='data/pathological_mobile_sites.json',
-        cloud_storage_bucket=story.PARTNER_BUCKET)
-
-    sites = [('cnn_pathological', 'http://edition.cnn.com'),
-             ('espn_pathological', 'http://m.espn.go.com/nhl/rankings'),
-             ('recode_pathological', 'http://recode.net'),
-             ('yahoo_sports_pathological', 'http://sports.yahoo.com/'),
-             ('latimes_pathological', 'http://www.latimes.com'),
-             ('pbs_pathological', 'http://www.pbs.org/newshour/bb/'
-              'much-really-cost-live-city-like-seattle/#the-rundown'),
-             ('guardian_pathological', 'http://www.theguardian.com/politics/2015/mar/09/'
-              'ed-balls-tory-spending-plans-nhs-charging'),
-             ('zdnet_pathological', 'http://www.zdnet.com'),
-             ('wow_wiki_pathological', 'http://www.wowwiki.com/'
-              'World_of_Warcraft:_Mists_of_Pandaria'),
-             ('linkedin_pathological', 'https://www.linkedin.com/in/linustorvalds')]
-
-    for name, site in sites:
-      self.AddStory(PathologicalMobileSitesPage(name=name,
-                                                url=site,
-                                                page_set=self))

tools/perf/page_sets/rendering/pathological_mobile_sites.py

+# Copyright 2015 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.
+from telemetry.page import shared_page_state
+from telemetry import story
+
+from page_sets.rendering import rendering_story
+from page_sets.system_health import platforms
+
+
+class PathologicalMobileSitesPage(rendering_story.RenderingStory):
+  ABSTRACT_STORY = True
+  SUPPORTED_PLATFORMS = platforms.MOBILE_ONLY
+
+  def __init__(self,
+               page_set,
+               shared_page_state_class=shared_page_state.SharedMobilePageState,
+               name_suffix='',
+               extra_browser_args=None):
+    super(PathologicalMobileSitesPage, self).__init__(
+        page_set=page_set,
+        shared_page_state_class=shared_page_state_class,
+        name_suffix=name_suffix,
+        extra_browser_args=extra_browser_args)
+
+  def RunPageInteractions(self, action_runner):
+    with action_runner.CreateGestureInteraction('ScrollAction'):
+      action_runner.ScrollPage()
+
+
+class CnnPathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'cnn_pathological'
+  URL = 'http://edition.cnn.com'
+
+
+class EspnPathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'espn_pathological'
+  URL = 'http://m.espn.go.com/nhl/rankings'
+
+
+class RecodePathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'recode_pathological'
+  URL = 'http://recode.net'
+
+
+class YahooSportsPathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'yahoo_sports_pathological'
+  URL = 'http://sports.yahoo.com/'
+
+
+class LaTimesPathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'latimes_pathological'
+  URL = 'http://www.latimes.com'
+
+
+class PbsPathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'pbs_pathological'
+  # pylint: disable=line-too-long
+  URL = 'http://www.pbs.org/newshour/bb/much-really-cost-live-city-like-seattle/#the-rundown'
+
+
+class GuardianPathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'guardian_pathological'
+  # pylint: disable=line-too-long
+  URL = 'http://www.theguardian.com/politics/2015/mar/09/ed-balls-tory-spending-plans-nhs-charging'
+
+
+class ZDNetPathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'zdnet_pathological'
+  URL = 'http://www.zdnet.com'
+
+
+class WowWikkiPathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'wow_wiki_pathological'
+  URL = 'http://www.wowwiki.com/World_of_Warcraft:_Mists_of_Pandaria'
+
+
+class LinkedInPathologicalPage(PathologicalMobileSitesPage):
+  BASE_NAME = 'linkedin_pathological'
+  URL = 'https://www.linkedin.com/in/linustorvalds'
+
+
+# TODO(crbug.com/760553):remove this class after
+# smoothness.pathological_mobile_sites benchmark is completely
+# replaced by rendering benchmarks
+class PathologicalMobileSitesPageSet(story.StorySet):
+
+  """Pathologically bad and janky sites on mobile."""
+
+  def __init__(self):
+    super(PathologicalMobileSitesPageSet, self).__init__(
+        archive_data_file='../data/pathological_mobile_sites.json',
+        cloud_storage_bucket=story.PARTNER_BUCKET)
+
+    page_classes = [CnnPathologicalPage,
+                    EspnPathologicalPage,
+                    RecodePathologicalPage,
+                    YahooSportsPathologicalPage,
+                    LaTimesPathologicalPage,
+                    PbsPathologicalPage,
+                    GuardianPathologicalPage,
+                    ZDNetPathologicalPage,
+                    WowWikkiPathologicalPage,
+                    LinkedInPathologicalPage]
+
+    for page_class in page_classes:
+      self.AddStory(page_class(self))