Add Wait* API to ActionRunner to wrap over WaitAction.

tools/perf/page_sets/gmail_alt_two_labels.py

Index: tools/perf/page_sets/gmail_alt_two_labels.py
diff --git a/tools/perf/page_sets/gmail_alt_two_labels.py b/tools/perf/page_sets/gmail_alt_two_labels.py
index 24365ed6c41608af243ad16c5fd8a0815de5739d..c23ce1a94792a2fda69aeae3ef0cd1ca1fffdc1d 100644
--- a/tools/perf/page_sets/gmail_alt_two_labels.py
+++ b/tools/perf/page_sets/gmail_alt_two_labels.py
@@ -24,11 +24,9 @@ class GmailAltTwoLabelsPage(page_module.Page):
 
   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 RunEndure(self, action_runner):
     action_runner.RunAction(ClickElementAction(
@@ -36,13 +34,13 @@ class GmailAltTwoLabelsPage(page_module.Page):
         'wait_until': {'condition': 'href_change'},
         'selector': 'a[href="https://mail.google.com/mail/u/0/?shva=1#sent"]'
       }))
-    action_runner.RunAction(WaitAction({'seconds': 1}))
+    action_runner.Wait(1)
     action_runner.RunAction(ClickElementAction(
       {
         'wait_until': {'condition': 'href_change'},
         'selector': 'a[href="https://mail.google.com/mail/u/0/?shva=1#inbox"]'
       }))
-    action_runner.RunAction(WaitAction({'seconds': 1}))
+    action_runner.Wait(1)
 
 
 class GmailAltTwoLabelsPageSet(page_set_module.PageSet):