Add Wait* API to ActionRunner to wrap over WaitAction.

tools/perf/page_sets/key_mobile_sites.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.
 # pylint: disable=W0401,W0614
 from telemetry.page.actions.all_page_actions import *
 from telemetry.page import page as page_module
 from telemetry.page import page_set as page_set_module
 
 
 class KeyMobileSitesPage(page_module.Page):
@@ skipping 29 matching lines @@
   """ Why: Typical mobile business site """
 
   def __init__(self, page_set):
     super(Page2, self).__init__(
       url=('http://iphone.capitolvolkswagen.com/index.htm'
            '#new-inventory_p_2Fsb-new_p_2Ehtm_p_3Freset_p_3DInventoryListing'),
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'text': 'Next 35',
-        'condition': 'element'
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': 'document.body.scrollHeight > 2560'
-      }))
+    action_runner.WaitForElement(contains_text='Next 35')
+    action_runner.WaitForJavaScriptCondition(
+        'document.body.scrollHeight > 2560')
 
 
 class Page3(KeyMobileSitesPage):
 
   """ Why: Image-heavy site """
 
   def __init__(self, page_set):
     super(Page3, self).__init__(
       url='http://cuteoverload.com',
       page_set=page_set)
 
     self.fastpath = True
 
 
 class Page4(KeyMobileSitesPage):
 
   """ Why: Top tech blog """
 
   def __init__(self, page_set):
     super(Page4, self).__init__(
       # pylint: disable=C0301
       url='http://www.theverge.com/2012/10/28/3568746/amazon-7-inch-fire-hd-ipad-mini-ad-ballsy',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': ('window.Chorus !== undefined &&'
-                       'window.Chorus.Comments !== undefined &&'
-                       'window.Chorus.Comments.Json !== undefined &&'
-                       '(window.Chorus.Comments.loaded ||'
-                       ' window.Chorus.Comments.Json.load_comments())')
-      }))
+    action_runner.WaitForJavaScriptCondition(
+        'window.Chorus !== undefined &&'
+        'window.Chorus.Comments !== undefined &&'
+        'window.Chorus.Comments.Json !== undefined &&'
+        '(window.Chorus.Comments.loaded ||'
+        ' window.Chorus.Comments.Json.load_comments())')
 
 
 class Page5(KeyMobileSitesPage):
 
   """ Why: Top news site """
 
   def __init__(self, page_set):
     super(Page5, self).__init__(
       # pylint: disable=C0301
       url='http://www.cnn.com/2012/10/03/politics/michelle-obama-debate/index.html',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction({'seconds': 8}))
+    action_runner.Wait(8)
 
 
 class Page6(KeyMobileSitesPage):
 
   """ Why: Social; top Google property; Public profile; infinite scrolls """
 
   def __init__(self, page_set):
     super(Page6, self).__init__(
       # pylint: disable=C0301
       url='https://plus.google.com/app/basic/110031535020051778989/posts?source=apppromo',
       page_set=page_set)
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction({'scroll_is_infinite': True}))
 
 
 class Page7(KeyMobileSitesPage):
 
   """ Why: #1 (Alexa global) """
 
   def __init__(self, page_set):
     super(Page7, self).__init__(
       url='https://facebook.com/barackobama',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': ('document.getElementById("u_0_c") !== null &&'
-                       'document.body.scrollHeight > window.innerHeight')
-      }))
+    action_runner.WaitForJavaScriptCondition(
+        'document.getElementById("u_0_c") !== null &&'
+        'document.body.scrollHeight > window.innerHeight')
 
 
 class Page8(KeyMobileSitesPage):
 
   """ Why: #3 (Alexa global) """
 
   def __init__(self, page_set):
     super(Page8, self).__init__(
       url='http://m.youtube.com/watch?v=9hBpF_Zj4OA',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': 'document.getElementById("paginatortarget") !== null'
-      }))
+    action_runner.WaitForJavaScriptCondition(
+        'document.getElementById("paginatortarget") !== null')
 
 
 class Page9(KeyMobileSitesPage):
 
   """
   Why: #11 (Alexa global), google property; some blogger layouts have infinite
   scroll but more interesting
   """
 
   def __init__(self, page_set):
@@ skipping 20 matching lines @@
   """ Why: #12 (Alexa global),Public profile """
 
   def __init__(self, page_set):
     super(Page11, self).__init__(
       url='https://www.linkedin.com/in/linustorvalds',
       page_set=page_set,
       name='LinkedIn')
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript':
-          'document.getElementById("profile-view-scroller") !== null'
-      }))
+    action_runner.WaitForJavaScriptCondition(
+        'document.getElementById("profile-view-scroller") !== null')
 
 
 class Page12(KeyMobileSitesPage):
 
   """ Why: #6 (Alexa) most visited worldwide, picked an interesting page """
 
   def __init__(self, page_set):
     super(Page12, self).__init__(
       url='http://en.wikipedia.org/wiki/Wikipedia',
       page_set=page_set,
@@ skipping 40 matching lines @@
   """ Why: #1 Alexa reference """
 
   def __init__(self, page_set):
     super(Page16, self).__init__(
       # pylint: disable=C0301
       url='http://answers.yahoo.com/question/index?qid=20110117024343AAopj8f',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'text': 'Other Answers (1 - 20 of 149)',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(contains_text='Other Answers (1 - 20 of 149)')
     action_runner.RunAction(ClickElementAction(
       {
         'text': 'Other Answers (1 - 20 of 149)'
       }))
 
 
 class Page17(KeyMobileSitesPage):
 
   """ Why: productivity, top google properties """
 
   def __init__(self, page_set):
     super(Page17, self).__init__(
       url='https://mail.google.com/mail/',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': 'document.getElementById("og_user_warning") !== null'
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': 'document.getElementById("og_user_warning") === null'
-      }))
+    action_runner.WaitForJavaScriptCondition(
+        'document.getElementById("og_user_warning") !== null')
+    action_runner.WaitForJavaScriptCondition(
+        'document.getElementById("og_user_warning") === null')
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scrollable_element_function':
           ('function(callback) {'
            'callback(document.getElementById("views")'
            '.childNodes[1].firstChild); }')
       }))
     action_runner.RunAction(ScrollAction(
@@ skipping 48 matching lines @@
   def __init__(self, page_set):
     super(Page21, self).__init__(
       url='http://groupcloned.com',
       page_set=page_set)
 
     self.disabled = ('Page behaves non-deterministically, replaced with test'
                      'version for now')
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction({'seconds': 5}))
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': '''
-          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'''
-      }))
+    action_runner.Wait(5)
+    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''')
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scroll_distance_function': '''
           function() {
             return Math.max(0, 1250 + document.getElementById("element-19")
                                               .contentDocument
                                               .getElementById("element-22")
                                               .getBoundingClientRect().top);
           }''',
         'scroll_requires_touch': True
       }))
 
 
 class Page22(KeyMobileSitesPage):
 
   """ Why: crbug.com/172906 """
 
   def __init__(self, page_set):
     super(Page22, self).__init__(
       url='http://groupcloned.com/test/list-images-variable/index.html',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': 'document.getElementById("element-5") !== null'
-      }))
+    action_runner.WaitForJavaScriptCondition(
+        'document.getElementById("element-5") !== null')
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scroll_distance_function': '''
           function() {
             return Math.max(0, 1250 +
               document.getElementById("element-5").getBoundingClientRect().top);
           }''',
         'scroll_requires_touch': True
@@ skipping 16 matching lines @@
 
   """ Why: Google News: accelerated scrolling version """
 
   def __init__(self, page_set):
     super(Page24, self).__init__(
       url='http://mobile-news.sandbox.google.com/news/pt1',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': ('typeof NEWS_telemetryReady !== "undefined" && '
-                       'NEWS_telemetryReady == true')
-      }))
+    action_runner.WaitForJavaScriptCondition(
+        'typeof NEWS_telemetryReady !== "undefined" && '
+        'NEWS_telemetryReady == true')
 
 
 class Page25(KeyMobileSitesPage):
 
   """
   Why: Google News: this iOS version is slower than accelerated scrolling
   """
 
   def __init__(self, page_set):
     super(Page25, self).__init__(
       url='http://mobile-news.sandbox.google.com/news/pt0',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript': 'document.getElementById(":h") != null'
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 1
-      }))
+    action_runner.WaitForJavaScriptCondition(
+        'document.getElementById(":h") != null')
+    action_runner.Wait(1)
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scroll_requires_touch': True,
         'scrollable_element_function': '''
           function(callback) {
             callback(document.getElementById(':5'));
           }''',
         'scroll_distance_function': '''
@@ skipping 106 matching lines @@
       'http://www.deviantart.com/',
       # Why: Top search engine
       ('http://www.baidu.com/s?wd=barack+obama&rsv_bp=0&rsv_spt=3&rsv_sug3=9&'
        'rsv_sug=0&rsv_sug4=3824&rsv_sug1=3&inputT=4920'),
       # Why: Top search engine
       'http://www.bing.com/search?q=sloths'
     ]
 
     for url in urls_list:
       self.AddPage(KeyMobileSitesPage(url, self))