Add Wait* API to ActionRunner to wrap over WaitAction.

tools/perf/page_sets/gmail_expand_collapse_conversation.py

Index: tools/perf/page_sets/gmail_expand_collapse_conversation.py
diff --git a/tools/perf/page_sets/gmail_expand_collapse_conversation.py b/tools/perf/page_sets/gmail_expand_collapse_conversation.py
index 2bfd8604e16c75ec4c17b02aaddf0788b1e11da1..f223e654d794fec0f978e1feaee20536eeba0875 100644
--- a/tools/perf/page_sets/gmail_expand_collapse_conversation.py
+++ b/tools/perf/page_sets/gmail_expand_collapse_conversation.py
@@ -25,48 +25,32 @@ class GmailExpandCollapseConversationPage(
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'img[alt="Expand all"]'
-      }))
+    action_runner.WaitForElement('img[alt="Expand all"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'img[alt="Expand all"]'
       }))
-    action_runner.RunAction(WaitAction({'seconds': 5}))
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'img[alt="Collapse all"]'
-      }))
+    action_runner.Wait(5)
+    action_runner.WaitForElement('img[alt="Collapse all"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'img[alt="Collapse all"]'
       }))
-    action_runner.RunAction(WaitAction({'seconds': 1}))
+    action_runner.Wait(1)
 
   def RunEndure(self, action_runner):
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'img[alt="Expand all"]'
-      }))
+    action_runner.WaitForElement('img[alt="Expand all"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'img[alt="Expand all"]'
       }))
-    action_runner.RunAction(WaitAction({'seconds': 1}))
-    action_runner.RunAction(WaitAction(
-      {
-        'condition': 'element',
-        'selector': 'img[alt="Collapse all"]'
-      }))
+    action_runner.Wait(1)
+    action_runner.WaitForElement('img[alt="Collapse all"]')
     action_runner.RunAction(ClickElementAction(
       {
         'selector': 'img[alt="Collapse all"]'
       }))
-    action_runner.RunAction(WaitAction({'seconds': 1}))
+    action_runner.Wait(1)
 
 
 class GmailExpandCollapseConversationPageSet(page_set_module.PageSet):