Add Wait* API to ActionRunner to wrap over WaitAction.

tools/perf/page_sets/tough_pinch_zoom_cases.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 ToughPinchZoomCasesPage(page_module.Page):
@@ skipping 13 matching lines @@
 
   """ Why: top google property; a google tab is often open. """
 
   def __init__(self, page_set):
     super(GoogleSearchPage, self).__init__(
       url='https://www.google.com/#hl=en&q=barack+obama',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'text': 'Next',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='Next')
 
 
 class GmailPage(ToughPinchZoomCasesPage):
 
   """ Why: productivity, top google properties """
 
   def __init__(self, page_set):
     super(GmailPage, 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' : (
-          'window.gmonkey !== undefined &&'
-          'document.getElementById("gb") !== null')
-      }))
+    action_runner.WaitForJavaScriptCondition(
+        'window.gmonkey !== undefined &&'
+        'document.getElementById("gb") !== null')
 
 
 class GoogleCalendarPage(ToughPinchZoomCasesPage):
 
   """ Why: productivity, top google properties """
 
   def __init__(self, page_set):
     super(GoogleCalendarPage, self).__init__(
       url='https://www.google.com/calendar/',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction({'seconds':2}))
+    action_runner.Wait(2)
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(PinchAction(
       {
         'left_anchor_percentage': 0.1,
         'top_anchor_percentage': 0.3
       }))
 
 
 class GoogleImageSearchPage(ToughPinchZoomCasesPage):
@@ skipping 14 matching lines @@
 
   def __init__(self, page_set):
     super(GooglePlusPage, self).__init__(
       url='https://plus.google.com/+BarackObama/posts',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'text': 'Home',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='Home')
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(PinchAction(
       {
         'element_function': '''
           function(callback) {
             callback(document.getElementById("110031535020051778989-tab-bar"))
           }'''
       }))
 
 
 class YoutubePage(ToughPinchZoomCasesPage):
 
   """ Why: #3 (Alexa global) """
 
   def __init__(self, page_set):
     super(YoutubePage, self).__init__(
       url='http://www.youtube.com',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction({'seconds':2}))
+    action_runner.Wait(2)
 
 class BlogSpotPage(ToughPinchZoomCasesPage):
 
   """
   Why: #11 (Alexa global), google property; some blogger layouts have infinite
   scroll but more interesting
   """
 
   def __init__(self, page_set):
     super(BlogSpotPage, self).__init__(
       url='http://googlewebmastercentral.blogspot.com/',
       page_set=page_set, name='Blogger')
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'text': 'accessibility',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='accessibility')
 
 
 class FacebookPage(ToughPinchZoomCasesPage):
 
   """ Why: top social,Public profile """
 
   def __init__(self, page_set):
     super(FacebookPage, self).__init__(
       url='http://www.facebook.com/barackobama',
       page_set=page_set, name='Facebook')
     self.credentials = 'facebook'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'text': 'About',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='About')
 
 
 class LinkedinPage(ToughPinchZoomCasesPage):
 
   """ 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')
@@ skipping 13 matching lines @@
 
   """ 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, name='Twitter')
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction({'seconds':2}))
+    action_runner.Wait(2)
 
 class ESPNPage(ToughPinchZoomCasesPage):
 
   """ Why: #1 sports """
 
   def __init__(self, page_set):
     super(ESPNPage, self).__init__(
       url='http://espn.go.com/nba',
       page_set=page_set, name='ESPN')
 
@@ skipping 13 matching lines @@
 
   """ Why: #1 games according to Alexa (with actual games in it) """
 
   def __init__(self, page_set):
     super(YahooGamePage, self).__init__(
       url='http://games.yahoo.com',
       page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction({'seconds':2}))
+    action_runner.Wait(2)
 
 
 class YahooAnswersPage(ToughPinchZoomCasesPage):
 
   """ Why: #1 Alexa reference """
 
   def __init__(self, page_set):
     super(YahooAnswersPage, self).__init__(
       url='http://answers.yahoo.com',
       page_set=page_set)
@@ skipping 48 matching lines @@
 
     self.AddPage(YahooGamePage(self))
 
     # Why: #1 Alexa recreation
     self.AddPage(ToughPinchZoomCasesPage('http://booking.com', self))
 
     self.AddPage(YahooAnswersPage(self))
 
     # Why: #1 Alexa sports
     self.AddPage(ToughPinchZoomCasesPage('http://sports.yahoo.com/', self))