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 b30f575161e86e6896db959ae44e46a053af77f4..14f193ec4055d2c41cdcc19e00aecdf2f8bdbd54 100644 |
--- a/tools/telemetry/telemetry/page/actions/page_action.py |
+++ b/tools/telemetry/telemetry/page/actions/page_action.py |
@@ -1,7 +1,6 @@ |
# Copyright 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. |
-from telemetry.page.actions import wait_until |
class PageActionNotSupported(Exception): |
pass |
@@ -17,25 +16,12 @@ class PageAction(object): |
if attributes: |
for k, v in attributes.iteritems(): |
setattr(self, k, v) |
- if hasattr(self, 'wait_until'): |
- self.wait_until = wait_until.WaitUntil(self, self.wait_until) |
- else: |
- self.wait_until = None |
def WillRunAction(self, tab): |
"""Override to do action-specific setup before |
Test.WillRunAction is called.""" |
pass |
- def WillWaitAfterRun(self): |
- return self.wait_until is not None |
- |
- def RunActionAndMaybeWait(self, tab): |
- if self.wait_until: |
- self.wait_until.RunActionAndWait(tab) |
- else: |
- self.RunAction(tab) |
- |
def RunAction(self, tab): |
raise NotImplementedError() |