Add Wait* API to ActionRunner to wrap over WaitAction.

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.
 # 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 Top25Page(page_module.Page):
@@ skipping 18 matching lines @@
 
   """ Why: top google property; a google tab is often open """
 
   def __init__(self, page_set):
     super(GoogleWebSearchPage, 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')
 
   def RunStressMemory(self, action_runner):
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Next',
         'wait_until': {
           'condition': 'href_change'
         }
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Next',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='Next')
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Next',
         'wait_until': {
           'condition': 'href_change'
         }
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Next',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='Next')
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Next',
         'wait_until': {
           'condition': 'href_change'
         }
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Previous',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='Previous')
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Previous',
         'wait_until': {
           'condition': 'href_change'
         }
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Previous',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='Previous')
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Previous',
         'wait_until': {
           'condition': 'href_change'
         }
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Previous',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='Previous')
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Previous',
         'wait_until': {
           'condition': 'href_change'
         }
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Images',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='Images')
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Images',
         'wait_until': {
           'condition': 'href_change'
         }
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Images',
-        'condition': 'element'
-      }))
+    action_runner.WaitForElement(text='Images')
 
 
 class GmailPage(Top25Page):
 
   """ 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')
 
   def RunStressMemory(self, action_runner):
     action_runner.RunAction(ClickElementAction(
       {
         'wait_until': {
           'condition': 'href_change'
         },
         'selector': 'a[href="https://mail.google.com/mail/u/0/?shva=1#starred"]'
       }))
     action_runner.RunAction(ClickElementAction(
@@ skipping 22 matching lines @@
 
   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.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'div[class~="navForward"]'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement('div[class~="navForward"]')
     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': 1
-      }))
+    action_runner.Wait(1)
 
   def RunStressMemory(self, action_runner):
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'div[class~="navForward"]'
       }))
-    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"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'div[class~="navForward"]'
       }))
-    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"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'div[class~="navForward"]'
       }))
-    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"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'div[class~="navForward"]'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'div[class~="navBack"]'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement('div[class~="navBack"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'div[class~="navBack"]'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'div[class~="navBack"]'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement('div[class~="navBack"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'div[class~="navBack"]'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'div[class~="navBack"]'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement('div[class~="navBack"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'div[class~="navBack"]'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'div[class~="navBack"]'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement('div[class~="navBack"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'div[class~="navBack"]'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'div[class~="navBack"]'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement('div[class~="navBack"]')
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scrollable_element_function': '''
           function(callback) {
             callback(document.getElementById('scrolltimedeventswk'));
           }'''
       }))
 
@@ skipping 18 matching lines @@
     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)')
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'javascript':
-          'document.getElementsByClassName("kix-appview-editor").length'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForJavaScriptCondition(
+        'document.getElementsByClassName("kix-appview-editor").length')
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scrollable_element_function': '''
           function(callback) {
             callback(document.getElementsByClassName('kix-appview-editor')[0]);
           }'''
       }))
 
 
 class GooglePlusPage(Top25Page):
 
   """ Why: social; top google property; Public profile; infinite scrolls """
 
   def __init__(self, page_set):
     super(GooglePlusPage, self).__init__(
       url='https://plus.google.com/110031535020051778989/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 RunStressMemory(self, action_runner):
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Home'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Profile',
-        'condition': 'element'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement(text='Profile')
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Profile'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Explore',
-        'condition': 'element'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement(text='Explore')
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Explore'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Events',
-        'condition': 'element'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement(text='Events')
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Events'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Communities',
-        'condition': 'element'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement(text='Communities')
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Communities'
       }))
-    action_runner.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
-    action_runner.RunAction(WaitAction(
-      {
-        'text' : 'Home',
-        'condition': 'element'
-      }))
+    action_runner.Wait(2)
+    action_runner.WaitForElement(text='Home')
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         "scroll_is_infinite": True
       }))
 
 
 class YoutubePage(Top25Page):
 
   """ 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(Top25Page):
 
   """ 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')
 
   def RunStressMemory(self, action_runner):
     action_runner.RunAction(ClickElementAction({'text' : 'accessibility'}))
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction({'text' : 'advanced'}))
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction({'text' : 'beginner'}))
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction({'text' : 'Home'}))
     action_runner.WaitForNavigate()
 
 
 class WordpressPage(Top25Page):
 
   """ Why: #18 (Alexa global), Picked an interesting post """
 
   def __init__(self, page_set):
     super(WordpressPage, self).__init__(
       # pylint: disable=C0301
       url='http://en.blog.wordpress.com/2012/09/04/freshly-pressed-editors-picks-for-august-2012/',
       page_set=page_set,
       name='Wordpress')
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector':
-          # pylint: disable=C0301
-          'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]'
-      }))
+    action_runner.WaitForElement(
+        # pylint: disable=C0301
+        'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]')
 
   def RunStressMemory(self, action_runner):
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction(
       {'selector':
           # pylint: disable=C0301
           'a[href="http://en.blog.wordpress.com/2012/08/30/new-themes-able-and-sight/"]'
       }))
     action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
@@ skipping 11 matching lines @@
 
   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')
 
   def RunStressMemory(self, action_runner):
     action_runner.RunAction(ClickElementAction({'text' : 'About'}))
     action_runner.WaitForNavigate()
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'The Audacity of Hope',
       }))
     action_runner.WaitForNavigate()
     action_runner.RunAction(ClickElementAction(
@@ skipping 51 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)
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scroll_is_infinite': True
       }))
 
 
 class PinterestPage(Top25Page):
 
@@ skipping 45 matching lines @@
 
   """ 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.RunAction(WaitAction(
-      {
-        'seconds': 2
-      }))
+    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__(
       credentials_path='data/credentials.json',
       user_agent_type='desktop',
@@ skipping 32 matching lines @@
       # 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))