| 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
|
| index 559e62ca639742ee51e8cd4562299c41e6b75f17..f50a810c66ec189f3faeb5af57139cc08ca8d2fa 100644
|
| --- a/tools/telemetry/telemetry/page/actions/wait_until.py
|
| +++ b/tools/telemetry/telemetry/page/actions/wait_until.py
|
| @@ -12,17 +12,16 @@ class WaitUntil(object):
|
| setattr(self, k, v)
|
| self._previous_action = previous_action
|
|
|
| - def RunActionAndWait(self, page, tab):
|
| + def RunActionAndWait(self, tab):
|
| if getattr(self, 'condition', None) == 'navigate':
|
| - self._previous_action.WillRunAction(page, tab)
|
| - action_to_perform = lambda: self._previous_action.RunAction(page, tab)
|
| + self._previous_action.WillRunAction(tab)
|
| + action_to_perform = lambda: self._previous_action.RunAction(tab)
|
| tab.PerformActionAndWaitForNavigate(action_to_perform, self.timeout)
|
| tab.WaitForDocumentReadyStateToBeInteractiveOrBetter()
|
|
|
| elif getattr(self, 'condition', None) == 'href_change':
|
| - self._previous_action.WillRunAction(page, tab)
|
| + self._previous_action.WillRunAction(tab)
|
| old_url = tab.EvaluateJavaScript('document.location.href')
|
| - self._previous_action.RunAction(page, tab)
|
| + self._previous_action.RunAction(tab)
|
| tab.WaitForJavaScriptExpression(
|
| 'document.location.href != "%s"' % old_url, self.timeout)
|
| -
|
|
|