Refactor top_25 so only page class with custom Run.. logic is defined

tools/perf/page_sets/top_25.py

 # 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.
 from telemetry.page import page as page_module
 from telemetry.page import page_set as page_set_module
 
 
 def _GetCurrentLocation(action_runner):
   return action_runner.EvaluateJavaScript('document.location.href')
 
 
 def _WaitForLocationChange(action_runner, old_href):
   action_runner.WaitForJavaScriptCondition(
       'document.location.href != "%s"' % old_href)
 
 
 class Top25Page(page_module.Page):
 
-  def __init__(self, url, page_set, name=''):
+  def __init__(self, url, page_set, name='', credentials=None):
     super(Top25Page, self).__init__(
         url=url, page_set=page_set, name=name,
         credentials_path='data/credentials.json')
     self.user_agent_type = 'desktop'
     self.archive_data_file = 'data/top_25.json'
+    self.credentials = credentials
 
   def RunSmoothness(self, action_runner):
     interaction = action_runner.BeginGestureInteraction(
         'ScrollAction', is_smooth=True)
     action_runner.ScrollPage()
     interaction.End()
 
   def RunRepaint(self, action_runner):
     action_runner.RepaintContinuously(seconds=5)
 
@@ skipping 67 matching lines @@
         })();''')
     action_runner.Wait(1)
 
   def RunSmoothness(self, action_runner):
     interaction = action_runner.BeginGestureInteraction(
         'ScrollAction', is_smooth=True)
     action_runner.ScrollElement(selector='#scrolltimedeventswk')
     interaction.End()
 
 
-class GoogleImageSearchPage(Top25Page):
-
-  """ Why: tough image case; top google properties """
-
-  def __init__(self, page_set):
-    super(GoogleImageSearchPage, self).__init__(
-      url='https://www.google.com/search?q=cats&tbm=isch',
-      page_set=page_set)
-
-    self.credentials = 'google'
-
-
 class GoogleDocPage(Top25Page):
 
   """ Why: productivity, top google properties; Sample doc in the link """
 
   def __init__(self, page_set):
     super(GoogleDocPage, self).__init__(
       # pylint: disable=C0301
       url='https://docs.google.com/document/d/1X-IKNjtEnx-WW5JIKRLsyhz5sbsat3mfTpAPUSX3_s4/view',
       page_set=page_set,
       name='Docs  (1 open document tab)')
@@ skipping 99 matching lines @@
     action_runner.NavigateToPage(self)
     action_runner.WaitForElement(text='About')
 
   def RunSmoothness(self, action_runner):
     interaction = action_runner.BeginGestureInteraction(
         'ScrollAction', is_smooth=True)
     action_runner.ScrollPage()
     interaction.End()
 
 
-class LinkedinPage(Top25Page):
 
-  """ Why: #12 (Alexa global),Public profile """
-
-  def __init__(self, page_set):
-    super(LinkedinPage, self).__init__(
-      url='http://www.linkedin.com/in/linustorvalds',
-      page_set=page_set,
-      name='LinkedIn')
-
-
-class WikipediaPage(Top25Page):
-
-  """ Why: #6 (Alexa) most visited worldwide,Picked an interesting page """
-
-  def __init__(self, page_set):
-    super(WikipediaPage, self).__init__(
-      url='http://en.wikipedia.org/wiki/Wikipedia',
-      page_set=page_set,
-      name='Wikipedia (1 tab)')
 
 
 class TwitterPage(Top25Page):
 
   """ Why: #8 (Alexa global),Picked an interesting page """
 
   def __init__(self, page_set):
     super(TwitterPage, self).__init__(
       url='https://twitter.com/katyperry',
       page_set=page_set,
@@ skipping 37 matching lines @@
       page_set=page_set,
       name='ESPN')
 
   def RunSmoothness(self, action_runner):
     interaction = action_runner.BeginGestureInteraction(
         'ScrollAction', is_smooth=True)
     action_runner.ScrollPage(left_start_ratio=0.1)
     interaction.End()
 
 
-class WeatherDotComPage(Top25Page):
-
-  """ Why: #7 (Alexa news); #27 total time spent,Picked interesting page """
-
-  def __init__(self, page_set):
-    super(WeatherDotComPage, self).__init__(
-      # pylint: disable=C0301
-      url='http://www.weather.com/weather/right-now/Mountain+View+CA+94043',
-      page_set=page_set,
-      name='Weather.com')
-
-
 class YahooGamesPage(Top25Page):
 
   """ Why: #1 games according to Alexa (with actual games in it) """
 
   def __init__(self, page_set):
     super(YahooGamesPage, self).__init__(
       url='http://games.yahoo.com',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.Wait(2)
 
 
 class Top25PageSet(page_set_module.PageSet):
 
   """ Pages hand-picked for 2012 CrOS scrolling tuning efforts. """
 
   def __init__(self):
     super(Top25PageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/top_25.json',
       bucket=page_set_module.PARTNER_BUCKET)
 
     self.AddPage(GoogleWebSearchPage(self))
     self.AddPage(GmailPage(self))
     self.AddPage(GoogleCalendarPage(self))
-    self.AddPage(GoogleImageSearchPage(self))
+    # Why: tough image case; top google properties
+    self.AddPage(
+        Top25Page('https://www.google.com/search?q=cats&tbm=isch',
+      page_set=self, credentials='google'))
     self.AddPage(GoogleDocPage(self))
     self.AddPage(GooglePlusPage(self))
     self.AddPage(YoutubePage(self))
     self.AddPage(BlogspotPage(self))
     self.AddPage(WordpressPage(self))
     self.AddPage(FacebookPage(self))
-    self.AddPage(LinkedinPage(self))
-    self.AddPage(WikipediaPage(self))
+    # Why: #12 (Alexa global), Public profile.
+    self.AddPage(
+        Top25Page(
+            'http://www.linkedin.com/in/linustorvalds', self, 'LinkedIn'))

[ernstm, 2014/10/27 21:30:04]

to be consistent with the other pages: page_set=self, credentials='LinkedIn'?

+    # Why: #6 (Alexa) most visited worldwide,Picked an interesting page
+    self.AddPage(
+        Top25Page(
+            'http://en.wikipedia.org/wiki/Wikipedia', page_set=self,
+            name='Wikipedia (1 tab)'))
     self.AddPage(TwitterPage(self))
     self.AddPage(PinterestPage(self))
     self.AddPage(ESPNPage(self))
-    self.AddPage(WeatherDotComPage(self))
+    # Why: #7 (Alexa news); #27 total time spent, picked interesting page.
+    self.AddPage(Top25Page(
+        url='http://www.weather.com/weather/right-now/Mountain+View+CA+94043',
+        page_set=self,
+        name='Weather.com'))
     self.AddPage(YahooGamesPage(self))
 
     other_urls = [
       # Why: #1 news worldwide (Alexa global)
       'http://news.yahoo.com',
       # Why: #2 news worldwide
       'http://www.cnn.com',
       # Why: #1 world commerce website by visits; #3 commerce in the US by time
       # spent
       'http://www.amazon.com',
       # Why: #1 commerce website by time spent by users in US
       'http://www.ebay.com',
       # Why: #1 Alexa recreation
       'http://booking.com',
       # Why: #1 Alexa reference
       'http://answers.yahoo.com',
       # Why: #1 Alexa sports
       'http://sports.yahoo.com/',
       # Why: top tech blog
       'http://techcrunch.com'
     ]
 
     for url in other_urls:
       self.AddPage(Top25Page(url, self))