Add Wait* API to ActionRunner to wrap over WaitAction.

tools/perf/page_sets/top_10.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 SimpleScrollPage(page_module.Page):
   def __init__(self, url, page_set, credentials='', name=''):
     super(SimpleScrollPage, self).__init__(url, page_set=page_set, name=name)
     self.credentials = credentials
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction())
 
 class Google(SimpleScrollPage):
   def __init__(self, page_set):
     super(Google, self).__init__(
       url='https://www.google.com/#hl=en&q=barack+obama', page_set=page_set)
 
   def RunNavigateSteps(self, action_runner):
     super(Google, self).RunNavigateSteps(action_runner)
-    action_runner.RunAction(WaitAction(
-      {'condition': 'element', 'text': 'Next'}))
+    action_runner.WaitForElement(text='Next')
 
 
 class Gmail(SimpleScrollPage):
   def __init__(self, page_set):
     super(Gmail, self).__init__(
       url='https://mail.google.com/mail/',
       page_set=page_set,
       credentials='google')
 
   def RunNavigateSteps(self, action_runner):
     super(Gmail, self).RunNavigateSteps(action_runner)
-    action_runner.RunAction(WaitAction(
-      {'javascript' : 'window.gmonkey !== undefined &&'
-       'document.getElementById("gb") !== null'}))
+    action_runner.WaitForJavaScriptCondition(
+        'window.gmonkey !== undefined &&'
+        'document.getElementById("gb") !== null')
 
 
 class GoogleCalendar(SimpleScrollPage):
   def __init__(self, page_set):
     super(GoogleCalendar, self).__init__(
       url='https://www.google.com/calendar/',
       page_set=page_set,
       credentials='google')
 
   def RunNavigateSteps(self, action_runner):
     super(GoogleCalendar, self).RunNavigateSteps(action_runner)
     action_runner.ExecuteJavaScript('''
         (function() { var elem = document.createElement("meta");
           elem.name="viewport";
           elem.content="initial-scale=1";
           document.body.appendChild(elem);
         })();''')
-    action_runner.RunAction(WaitAction({'seconds' : 2}))
-    action_runner.RunAction(WaitAction({
-      'condition' : 'element', 'selector' : 'div[class~="navForward"]'}))
+    action_runner.Wait(2)
+    action_runner.WaitForElement('div[class~="navForward"]')
 
 
 class Youtube(SimpleScrollPage):
   def __init__(self, page_set):
     super(Youtube, self).__init__(
       url='http://www.youtube.com',
       page_set=page_set,
       credentials='google')
 
   def RunNavigateSteps(self, action_runner):
     super(Youtube, self).RunNavigateSteps(action_runner)
-    action_runner.RunAction(WaitAction({'seconds' : 2}))
+    action_runner.Wait(2)
 
 
 class Facebook(SimpleScrollPage):
   def __init__(self, page_set):
     super(Facebook, self).__init__(
       url='http://www.facebook.com/barackobama',
       page_set=page_set,
       credentials='facebook',
       name='Facebook')
 
   def RunNavigateSteps(self, action_runner):
     super(Facebook, self).RunNavigateSteps(action_runner)
-    action_runner.RunAction(WaitAction(
-      {'condition': 'element', 'text': 'About'}))
+    action_runner.WaitForElement(text='About')
 
 
 class Top10PageSet(page_set_module.PageSet):
   """10 Pages chosen from Alexa top sites"""
 
   def __init__(self):
     super(Top10PageSet, self).__init__(
       archive_data_file='data/top_10.json',
       credentials_path='data/credentials.json',
       user_agent_type='desktop')
@@ skipping 21 matching lines @@
     self.AddPage(SimpleScrollPage('http://www.amazon.com', self))
 
     # #4 Alexa
     self.AddPage(SimpleScrollPage('http://www.yahoo.com/', self))
 
     # #16 Alexa
     self.AddPage(SimpleScrollPage('http://www.bing.com/', self))
 
     # #20 Alexa
     self.AddPage(SimpleScrollPage('http://www.ask.com/', self))