Remove href_change and navigate from wait action

tools/telemetry/telemetry/page/actions/wait_until.py

Index: tools/telemetry/telemetry/page/actions/wait_until.py
diff --git a/tools/telemetry/telemetry/page/actions/wait_until.py b/tools/telemetry/telemetry/page/actions/wait_until.py
new file mode 100644
index 0000000000000000000000000000000000000000..1ab6c97ba229f32f052272ae95d546df607c10b8
--- /dev/null
+++ b/tools/telemetry/telemetry/page/actions/wait_until.py
@@ -0,0 +1,56 @@
+# Copyright (c) 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.
+
+import telemetry.core.timeline.bounds as timeline_bounds
+
+
+WAIT_UNTIL_TIMELINE_MARKER = "WaitUntil"
+
+
+class WaitUntil(object):
+  _timeline_marker_id = 0
+
+  def __init__(self, previous_action, attributes=None):
+    assert previous_action is not None, 'wait_until must have a previous action'
+    self.timeout = 60
+    if attributes:
+      for k, v in attributes.iteritems():
+        setattr(self, k, v)
+    self._previous_action = previous_action
+
+  @staticmethod
+  def _IncrementMarkerId():
+    WaitUntil._timeline_marker_id += 1
+
+  def _GetUniqueTimelineMarkerName(self):
+    marker = \
+      '%s_%d' % (WAIT_UNTIL_TIMELINE_MARKER, WaitUntil._timeline_marker_id)
+    return marker
+
+  def RunActionAndWait(self, page, tab):
+    self._IncrementMarkerId()
+    tab.ExecuteJavaScript(
+        'console.time("' + self._GetUniqueTimelineMarkerName() + '")')
+
+    if getattr(self, 'condition', None) == 'navigate':
+      self._previous_action.WillRunAction(page, tab)
+      action_to_perform = lambda: self._previous_action.RunAction(page, tab)
+      tab.PerformActionAndWaitForNavigate(action_to_perform, self.timeout)
+      tab.WaitForDocumentReadyStateToBeInteractiveOrBetter()
+
+    elif getattr(self, 'condition', None) == 'href_change':
+      self._previous_action.WillRunAction(page, tab)
+      old_url = tab.EvaluateJavaScript('document.location.href')
+      self._previous_action.RunAction(page, tab)
+      tab.WaitForJavaScriptExpression(
+          'document.location.href != "%s"' % old_url, self.timeout)
+
+    tab.ExecuteJavaScript(
+        'console.timeEnd("' + self._GetUniqueTimelineMarkerName() + '")')
+
+  def GetActiveRangeOnTimeline(self, timeline):
+    active_range = timeline_bounds.Bounds()
+    active_range.AddEvent(
+      timeline.GetEventOfName(self._GetUniqueTimelineMarkerName(),True, True))
+    return active_range