Remove 'navigate' attribute from wait_until

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 494 matching lines @@
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.RunAction(WaitAction(
       {
         'text' : 'accessibility',
         'condition': 'element'
       }))
 
   def RunStressMemory(self, action_runner):
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'accessibility',
-        'wait_until': {
-          'condition': 'navigate'
-        }
-      }))
+    action_runner.RunAction(ClickElementAction({'text' : 'accessibility'}))
+    action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'advanced',
-        'wait_until': {
-          'condition': 'navigate'
-        }
-      }))
+    action_runner.RunAction(ClickElementAction({'text' : 'advanced'}))
+    action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'beginner',
-        'wait_until': {
-          'condition': 'navigate'
-        }
-      }))
+    action_runner.RunAction(ClickElementAction({'text' : 'beginner'}))
+    action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Home',
-        'wait_until': {
-          'condition': 'navigate'
-        }
-      }))
+    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/"]'
       }))
 
   def RunStressMemory(self, action_runner):
     action_runner.RunAction(ScrollAction())
     action_runner.RunAction(ClickElementAction(
-      {
-        'wait_until': {
-          'condition': 'navigate'
-        },
-        'selector':
+      {'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())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Features',
-        'wait_until': {
-          'condition': 'navigate'
-        }
-      }))
+    action_runner.RunAction(ClickElementAction({'text' : 'Features'}))
+    action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'News',
-        'wait_until': {
-          'condition': 'navigate'
-        }
-      }))
+    action_runner.RunAction(ClickElementAction({'text' : 'News'}))
+    action_runner.WaitForNavigate()
     action_runner.RunAction(ScrollAction())
 
 
 class FacebookPage(Top25Page):
 
   """ Why: top social,Public profile """
 
   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'
       }))
 
   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(
+      {
+        'text' : 'Back to Barack Obama\'s Timeline',
+      }))
+    action_runner.WaitForNavigate()
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'About',
-        'wait_until': {
-          'condition': 'navigate'
-        }
       }))
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'The Audacity of Hope',
-        'wait_until': {
-          'condition': 'navigate'
-        }
-      }))
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'Back to Barack Obama\'s Timeline',
-        'wait_until': {
-          'condition': 'navigate'
-        }
-      }))
-    action_runner.RunAction(ClickElementAction(
-      {
-        'text' : 'About',
-        'wait_until': {
-          'condition': 'navigate'
-        }
-      }))
+    action_runner.WaitForNavigate()
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Elected to U.S. Senate',
-        'wait_until': {
-          'condition': 'navigate'
-        }
       }))
+    action_runner.WaitForNavigate()
     action_runner.RunAction(ClickElementAction(
       {
         'text' : 'Home',
-        'wait_until': {
-          'condition': 'navigate'
-        }
       }))
+    action_runner.WaitForNavigate()
 
   def RunSmoothness(self, action_runner):
     action_runner.RunAction(ScrollAction(
       {
         'scroll_is_infinite': True
       }))
 
 
 class LinkedinPage(Top25Page):
 
@@ skipping 147 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))