Add Wait* API to ActionRunner to wrap over WaitAction.

content/test/gpu/gpu_tests/webgl_conformance.py

 # Copyright (c) 2012 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.
 import json
 import optparse
 import os
 import sys
 
 import webgl_conformance_expectations
 
@@ skipping 71 matching lines @@
   def __init__(self, page_set, test):
     super(WebglConformancePage, self).__init__(
       url='file://' + test, page_set=page_set, base_dir=page_set.base_dir,
       name=('WebglConformance.%s' %
               test.replace('/', '_').replace('-', '_').
                  replace('\\', '_').rpartition('.')[0].replace('.', '_')))
     self.script_to_evaluate_on_commit = conformance_harness_script
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {'javascript': 'webglTestHarness._finished', 'timeout': 120}))
+    action_runner.WaitForJavaScriptCondition(
+        'webglTestHarness._finished', timeout=120)
 
 
 class WebglConformance(test_module.Test):
   """Conformance with Khronos WebGL Conformance Tests"""
   test = WebglConformanceValidator
 
   @classmethod
   def AddTestCommandLineArgs(cls, group):
     group.add_option('--webgl-conformance-version',
         help='Version of the WebGL conformance tests to run.',
@@ skipping 54 matching lines @@
 
         if '.txt' in test_name:
           include_path = os.path.join(current_dir, test_name)
           test_paths += WebglConformance._ParseTests(
             include_path, version)
         else:
           test = os.path.join(current_dir, test_name)
           test_paths.append(test)
 
     return test_paths