Add Wait* API to ActionRunner to wrap over WaitAction.

content/test/gpu/gpu_tests/maps.py

 # Copyright 2013 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.
 
 """Runs a Google Maps pixel test.
 Performs several common navigation actions on the map (pan, zoom, rotate) then
 captures a screenshot and compares selected pixels against expected values"""
 
 import json
 import optparse
@@ skipping 66 matching lines @@
   def __init__(self, page_set, base_dir):
     super(MapsPage, self).__init__(
       url='http://localhost:10020/tracker.html',
       page_set=page_set,
       base_dir=base_dir,
       name='Maps.maps_002')
     self.pixel_expectations = 'data/maps_002_expectations.json'
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction({'javascript': 'window.testDone',
-                                        'timeout': 180}))
+    action_runner.WaitForJavaScriptCondition('window.testDone', timeout=180)
 
 
 class Maps(cloud_storage_test_base.TestBase):
   """Google Maps pixel tests."""
   test = _MapsValidator
 
   def CreateExpectations(self, page_set):
     return maps_expectations.MapsExpectations()
 
   def CreatePageSet(self, options):
     page_set_path = os.path.join(
         util.GetChromiumSrcDir(), 'content', 'test', 'gpu', 'page_sets')
     ps = page_set.PageSet(archive_data_file='data/maps.json',
                           make_javascript_deterministic=False,
                           file_path=page_set_path)
     ps.AddPage(MapsPage(ps, ps.base_dir))
     return ps