Index: tools/telemetry/telemetry/page/page_test.py |
diff --git a/tools/telemetry/telemetry/page/page_test.py b/tools/telemetry/telemetry/page/page_test.py |
index e9d7147664b9fea315e8463b82b582fef4072b47..405a621c9332131c1a6582c0afb9ebdd0d0a8e91 100644 |
--- a/tools/telemetry/telemetry/page/page_test.py |
+++ b/tools/telemetry/telemetry/page/page_test.py |
@@ -205,22 +205,15 @@ class PageTest(object): |
def RunNavigateSteps(self, page, tab): |
"""Navigates the tab to the page URL attribute. |
- If 'navigate_steps' is defined for the page, this will attempt to |
- run it as a compound action. |
+ Runs the 'navigate_steps' page attribute as a compound action. |
""" |
- if hasattr(page, 'navigate_steps'): |
- navigate_actions = GetCompoundActionFromPage(page, 'navigate_steps') |
- if not any(isinstance(action, navigate.NavigateAction) |
- for action in navigate_actions): |
- raise page_action.PageActionFailed( |
- 'No NavigateAction in navigate_steps') |
- self._RunCompoundAction(page, tab, navigate_actions, False) |
- else: |
- # TODO(edmundyan): Make a default navigate_steps action on the page object |
- # once we can deprecate page.WaitToLoad() |
- i = navigate.NavigateAction() |
- i.RunAction(page, tab, None) |
- page.WaitToLoad(tab, 60) |
+ navigate_actions = GetCompoundActionFromPage(page, 'navigate_steps') |
+ if not any(isinstance(action, navigate.NavigateAction) |
+ for action in navigate_actions): |
+ raise page_action.PageActionFailed( |
+ 'No NavigateAction in navigate_steps') |
+ |
+ self._RunCompoundAction(page, tab, navigate_actions, False) |
@property |
def action_name_to_run(self): |