Remove href_change and navigate from wait action

tools/telemetry/telemetry/page/actions/page_action.py

Index: tools/telemetry/telemetry/page/actions/page_action.py
diff --git a/tools/telemetry/telemetry/page/actions/page_action.py b/tools/telemetry/telemetry/page/actions/page_action.py
index 17b42efcc6a5718b9cf171ca70977fbe2be812e8..684d6315ffd067c4137dfd3ae7dab470dfd50dcd 100644
--- a/tools/telemetry/telemetry/page/actions/page_action.py
+++ b/tools/telemetry/telemetry/page/actions/page_action.py
@@ -2,7 +2,9 @@
 # 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
+from telemetry.page.actions import wait_until
 
 class PageActionNotSupported(Exception):
   pass
@@ -23,6 +25,10 @@ class PageAction(object):
         setattr(self, k, v)
     self._timeline_marker_base_name = None
     self._timeline_marker_id = None
+    if hasattr(self, 'wait_until'):
+      self.wait_until = wait_until.WaitUntil(self, self.wait_until)
+    else:
+      self.wait_until = None
 
   def CustomizeBrowserOptionsForPageSet(self, options):
     """Override to add action-specific options to the BrowserOptions
@@ -50,16 +56,17 @@ class PageAction(object):
     Test.WillRunAction is called."""
     pass
 
-  def RunAction(self, page, tab, previous_action):
-    raise NotImplementedError()
+  def WillWaitAfterRun(self):
+    return self.wait_until is not None
 
-  def RunsPreviousAction(self):
-    """Some actions require some initialization to be performed before the
-    previous action. For example, wait for href change needs to record the old
-    href before the previous action changes it. Therefore, we allow actions to
-    run the previous action. An action that does this should override this to
-    return True in order to prevent the previous action from being run twice."""
-    return False
+  def RunActionAndMaybeWait(self, page, tab):
+    if self.wait_until:
+      self.wait_until.RunActionAndWait(page, tab)
+    else:
+      self.RunAction(page, tab)
+
+  def RunAction(self, page, tab):
+    raise NotImplementedError()
 
   def CleanUp(self, page, tab):
     pass
@@ -108,5 +115,8 @@ class PageAction(object):
       active_range.AddEvent(
           timeline.GetEventOfName(self._GetUniqueTimelineMarkerName(),
                                   True, True))
+    if self.wait_until:
+      active_range.AddBounds(
+          self.wait_until.GetActiveRangeOnTimeline(timeline))
 
     return active_range