Removing Page.WaitToLoad and update all pagesets to use explicit wait actions

tools/telemetry/telemetry/page/page.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 os
 import re
-import time
 import urlparse
 
-from telemetry.core import util
+from telemetry.page.actions import navigate
 
 def _UrlPathJoin(*args):
   """Joins each path in |args| for insertion into a URL path.
 
   This is distinct from os.path.join in that:
   1. Forward slashes are always used.
   2. Paths beginning with '/' are not treated as absolute.
 
   For example:
     _UrlPathJoin('a', 'b') => 'a/b'
@@ skipping 28 matching lines @@
       else:
         raise Exception('URLs must be fully qualified: %s' % url)
     self.url = url
     self.page_set = page_set
     self.base_dir = base_dir
 
     # These attributes can be set dynamically by the page.
     self.credentials = None
     self.disabled = False
     self.script_to_evaluate_on_commit = None
+    self.navigate_actions = [navigate.NavigateAction()]

[edmundyan, 2013/08/20 23:02:40]

This is to address the TODO in page_test to make a default action

 
     if attributes:
       for k, v in attributes.iteritems():
         setattr(self, k, v)
 
   def __getattr__(self, name):
     if self.page_set and hasattr(self.page_set, name):
       return getattr(self.page_set, name)
 
     raise AttributeError()
@@ skipping 36 matching lines @@
                  for p in self.page_set if p.is_file]
     common_prefix = os.path.commonprefix(url_paths)
     return self.url[len(common_prefix):].strip('/')
 
   @property
   def archive_path(self):
     return self.page_set.WprFilePathForPage(self)
 
   def __str__(self):
     return self.url
-
-  def WaitToLoad(self, tab, timeout, poll_interval=0.1):
-    Page.WaitForPageToLoad(self, tab, timeout, poll_interval)
-
-  # TODO(dtu): Remove this method when no page sets use a click interaction
-  # with a wait condition. crbug.com/168431
-  @staticmethod
-  def WaitForPageToLoad(obj, tab, timeout, poll_interval=0.1):
-    """Waits for various wait conditions present in obj."""
-    if hasattr(obj, 'wait_seconds'):
-      time.sleep(obj.wait_seconds)
-    if hasattr(obj, 'wait_for_element_with_text'):
-      callback_code = 'function(element) { return element != null; }'
-      util.WaitFor(
-          lambda: util.FindElementAndPerformAction(
-              tab, obj.wait_for_element_with_text, callback_code),
-          timeout, poll_interval)
-    if hasattr(obj, 'wait_for_element_with_selector'):
-      util.WaitFor(lambda: tab.EvaluateJavaScript(
-           'document.querySelector(\'' + obj.wait_for_element_with_selector +
-           '\') != null'), timeout, poll_interval)
-    if hasattr(obj, 'post_navigate_javascript_to_execute'):
-      tab.EvaluateJavaScript(obj.post_navigate_javascript_to_execute)
-    if hasattr(obj, 'wait_for_javascript_expression'):
-      util.WaitFor(
-          lambda: tab.EvaluateJavaScript(obj.wait_for_javascript_expression),
-          timeout, poll_interval)