telemetry: Allow specifying extra_browser_args for top pages.

We want multiple instances of these pages with different flags e.g.
sw raster and gpu raster in the new rendering.desktop/mobile page sets.

BUG=760553

Change-Id: I48e2ac82a4314cdf36a61f301559160b8d801f52
Reviewed-on: https://chromium-review.googlesource.com/887798
Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#533043}

tools/perf/page_sets/key_mobile_sites_pages.py

@@ -7,25 +7,30 @@ from telemetry.page import shared_page_state
 
 class KeyMobileSitesPage(page_module.Page):
 
-  def __init__(self, url, page_set, name='', tags=None):
+  def __init__(self, url, page_set, name='', tags=None,
+               extra_browser_args=None):
     if name == '':
       name = url
     super(KeyMobileSitesPage, self).__init__(
-        url=url, page_set=page_set, name=name,
+        url=url,
+        page_set=page_set,
+        name=name,
         shared_page_state_class=shared_page_state.SharedMobilePageState,
-        tags=tags)
+        tags=tags,
+        extra_browser_args=extra_browser_args)
 
 
 class CapitolVolkswagenPage(KeyMobileSitesPage):
-
   """ Why: Typical mobile business site """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(CapitolVolkswagenPage, self).__init__(
-      url=('http://iphone.capitolvolkswagen.com/index.htm'
-           '#new-inventory_p_2Fsb-new_p_2Ehtm_p_3Freset_p_3DInventoryListing'),
-      page_set=page_set,
-      name=name)
+        url=(
+            'http://iphone.capitolvolkswagen.com/index.htm'
+            '#new-inventory_p_2Fsb-new_p_2Ehtm_p_3Freset_p_3DInventoryListing'),
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(CapitolVolkswagenPage, self).RunNavigateSteps(action_runner)
@@ -34,17 +39,17 @@ class CapitolVolkswagenPage(KeyMobileSitesPage):
         'document.body.scrollHeight > 2560')
 
 
-
 class TheVergeArticlePage(KeyMobileSitesPage):
-
   """ Why: Top tech blog """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(TheVergeArticlePage, self).__init__(
-      # pylint: disable=line-too-long
-      url='http://www.theverge.com/2012/10/28/3568746/amazon-7-inch-fire-hd-ipad-mini-ad-ballsy',
-      page_set=page_set,
-      name=name)
+        # pylint: disable=line-too-long
+        url=
+        'http://www.theverge.com/2012/10/28/3568746/amazon-7-inch-fire-hd-ipad-mini-ad-ballsy',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(TheVergeArticlePage, self).RunNavigateSteps(action_runner)
@@ -57,31 +62,31 @@ class TheVergeArticlePage(KeyMobileSitesPage):
 
 
 class CnnArticlePage(KeyMobileSitesPage):
-
   """ Why: Top news site """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(CnnArticlePage, self).__init__(
-      # pylint: disable=line-too-long
-      url='http://www.cnn.com/2012/10/03/politics/michelle-obama-debate/index.html',
-      page_set=page_set,
-      name=name)
+        # pylint: disable=line-too-long
+        url=
+        'http://www.cnn.com/2012/10/03/politics/michelle-obama-debate/index.html',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(CnnArticlePage, self).RunNavigateSteps(action_runner)
     action_runner.Wait(8)
 
 
-
 class FacebookPage(KeyMobileSitesPage):
-
   """ Why: #1 (Alexa global) """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(FacebookPage, self).__init__(
-      url='https://facebook.com/barackobama',
-      page_set=page_set,
-      name=name)
+        url='https://facebook.com/barackobama',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(FacebookPage, self).RunNavigateSteps(action_runner)
@@ -91,14 +96,14 @@ class FacebookPage(KeyMobileSitesPage):
 
 
 class YoutubeMobilePage(KeyMobileSitesPage):
-
   """ Why: #3 (Alexa global) """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(YoutubeMobilePage, self).__init__(
-      url='http://m.youtube.com/watch?v=9hBpF_Zj4OA',
-      page_set=page_set,
-      name=name)
+        url='http://m.youtube.com/watch?v=9hBpF_Zj4OA',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(YoutubeMobilePage, self).RunNavigateSteps(action_runner)
@@ -107,14 +112,14 @@ class YoutubeMobilePage(KeyMobileSitesPage):
 
 
 class LinkedInPage(KeyMobileSitesPage):
-
   """ Why: #12 (Alexa global),Public profile """
 
-  def __init__(self, page_set, name='LinkedIn'):
+  def __init__(self, page_set, name='LinkedIn', extra_browser_args=None):
     super(LinkedInPage, self).__init__(
-      url='https://www.linkedin.com/in/linustorvalds',
-      page_set=page_set,
-      name=name)
+        url='https://www.linkedin.com/in/linustorvalds',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(LinkedInPage, self).RunNavigateSteps(action_runner)
@@ -122,17 +127,16 @@ class LinkedInPage(KeyMobileSitesPage):
         'document.getElementById("profile-view-scroller") !== null')
 
 
-
 class YahooAnswersPage(KeyMobileSitesPage):
-
   """ Why: #1 Alexa reference """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(YahooAnswersPage, self).__init__(
-      # pylint: disable=line-too-long
-      url='http://answers.yahoo.com/question/index?qid=20110117024343AAopj8f',
-      page_set=page_set,
-      name=name)
+        # pylint: disable=line-too-long
+        url='http://answers.yahoo.com/question/index?qid=20110117024343AAopj8f',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(YahooAnswersPage, self).RunNavigateSteps(action_runner)
@@ -141,37 +145,36 @@ class YahooAnswersPage(KeyMobileSitesPage):
 
 
 class GroupClonedPage(KeyMobileSitesPage):
-
   """ Why: crbug.com/172906 """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(GroupClonedPage, self).__init__(
-      url='http://groupcloned.com',
-      page_set=page_set,
-      name=name)
-
+        url='http://groupcloned.com',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(GroupClonedPage, self).RunNavigateSteps(action_runner)
     action_runner.Wait(5)
-    action_runner.WaitForJavaScriptCondition('''
+    action_runner.WaitForJavaScriptCondition("""
         document.getElementById("element-19") !== null &&
         document.getElementById("element-19").contentDocument
           .getElementById("element-22") !== null &&
         document.getElementById("element-19").contentDocument
           .getElementsByClassName(
-              "container list-item gc-list-item stretched").length !== 0''')
+              "container list-item gc-list-item stretched").length !== 0""")
 
 
 class GroupClonedListImagesPage(KeyMobileSitesPage):
-
   """ Why: crbug.com/172906 """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(GroupClonedListImagesPage, self).__init__(
-      url='http://groupcloned.com/test/list-images-variable/index.html',
-      page_set=page_set,
-      name=name)
+        url='http://groupcloned.com/test/list-images-variable/index.html',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(GroupClonedListImagesPage, self).RunNavigateSteps(action_runner)
@@ -180,14 +183,14 @@ class GroupClonedListImagesPage(KeyMobileSitesPage):
 
 
 class GoogleNewsMobilePage(KeyMobileSitesPage):
-
   """ Why: Google News: accelerated scrolling version """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(GoogleNewsMobilePage, self).__init__(
-      url='http://mobile-news.sandbox.google.com/news/pt1',
-      page_set=page_set,
-      name=name)
+        url='http://mobile-news.sandbox.google.com/news/pt1',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(GoogleNewsMobilePage, self).RunNavigateSteps(action_runner)
@@ -197,16 +200,16 @@ class GoogleNewsMobilePage(KeyMobileSitesPage):
 
 
 class GoogleNewsMobile2Page(KeyMobileSitesPage):
-
   """
   Why: Google News: this iOS version is slower than accelerated scrolling
   """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(GoogleNewsMobile2Page, self).__init__(
-      url='http://mobile-news.sandbox.google.com/news/pt0',
-      page_set=page_set,
-      name=name)
+        url='http://mobile-news.sandbox.google.com/news/pt0',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)
 
   def RunNavigateSteps(self, action_runner):
     super(GoogleNewsMobile2Page, self).RunNavigateSteps(action_runner)
@@ -216,13 +219,13 @@ class GoogleNewsMobile2Page(KeyMobileSitesPage):
 
 
 class AmazonNicolasCagePage(KeyMobileSitesPage):
-
   """
   Why: #1 world commerce website by visits; #3 commerce in the US by time spent
   """
 
-  def __init__(self, page_set, name=''):
+  def __init__(self, page_set, name='', extra_browser_args=None):
     super(AmazonNicolasCagePage, self).__init__(
-      url='http://www.amazon.com/gp/aw/s/ref=is_box_?k=nicolas+cage',
-      page_set=page_set,
-      name=name)
+        url='http://www.amazon.com/gp/aw/s/ref=is_box_?k=nicolas+cage',
+        page_set=page_set,
+        name=name,
+        extra_browser_args=extra_browser_args)

tools/perf/page_sets/top_25_smooth.py

@@ -30,14 +30,15 @@ def _CreatePageClassWithSmoothInteractions(page_cls):
 
 class TopSmoothPage(page_module.Page):
 
-  def __init__(self, url, page_set, name=''):
+  def __init__(self, url, page_set, name='', extra_browser_args=None):
     if name == '':
       name = url
     super(TopSmoothPage, self).__init__(
         url=url,
         page_set=page_set,
         name=name,
-        shared_page_state_class=shared_page_state.SharedDesktopPageState)
+        shared_page_state_class=shared_page_state.SharedDesktopPageState,
+        extra_browser_args=extra_browser_args)
 
   def RunPageInteractions(self, action_runner):
     action_runner.Wait(1)