Index: content/test/gpu/gpu_tests/context_lost_integration_test.py |
diff --git a/content/test/gpu/gpu_tests/context_lost_integration_test.py b/content/test/gpu/gpu_tests/context_lost_integration_test.py |
index 670f8509fc9c07b32da43a4864f38e6bfdfc971d..98dabb1da3a1fe3202050caccaf920a185189e4a 100644 |
--- a/content/test/gpu/gpu_tests/context_lost_integration_test.py |
+++ b/content/test/gpu/gpu_tests/context_lost_integration_test.py |
@@ -106,7 +106,7 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
def _WaitForPageToFinish(self, tab): |
try: |
- tab.WaitForJavaScriptCondition2( |
+ tab.WaitForJavaScriptCondition( |
'window.domAutomationController._finished', timeout=wait_timeout) |
return True |
except exceptions.TimeoutException: |
@@ -122,13 +122,13 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
expected_kills = x + 1 |
# Reset the test's state. |
- tab.EvaluateJavaScript2( |
+ tab.EvaluateJavaScript( |
'window.domAutomationController.reset()') |
# If we're running the GPU process crash test, we need the test |
# to have fully reset before crashing the GPU process. |
if check_crash_count: |
- tab.WaitForJavaScriptCondition2( |
+ tab.WaitForJavaScriptCondition( |
'window.domAutomationController._finished', timeout=wait_timeout) |
# Crash the GPU process. |
@@ -154,7 +154,7 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
print 'Tab crashed while closing chrome://gpucrash' |
if not completed: |
self.fail('Test didn\'t complete (no context lost event?)') |
- if not tab.EvaluateJavaScript2( |
+ if not tab.EvaluateJavaScript( |
'window.domAutomationController._succeeded'): |
self.fail('Test failed (context not restored properly?)') |
@@ -162,7 +162,7 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
if not tab.browser.supports_system_info: |
self.fail('Browser must support system info') |
- if not tab.EvaluateJavaScript2( |
+ if not tab.EvaluateJavaScript( |
'window.domAutomationController._succeeded'): |
self.fail('Test failed (didn\'t render content properly?)') |
@@ -197,7 +197,7 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
url = self.UrlOfStaticFilePath(test_path) |
tab = self.tab |
tab.Navigate(url, script_to_evaluate_on_commit=harness_script) |
- tab.action_runner.WaitForJavaScriptCondition2( |
+ tab.action_runner.WaitForJavaScriptCondition( |
'window.domAutomationController._loaded') |
def _WaitForTabAndCheckCompletion(self): |
@@ -205,7 +205,7 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
completed = self._WaitForPageToFinish(tab) |
if not completed: |
self.fail('Test didn\'t complete (no context restored event?)') |
- if not tab.EvaluateJavaScript2('window.domAutomationController._succeeded'): |
+ if not tab.EvaluateJavaScript('window.domAutomationController._succeeded'): |
self.fail('Test failed (context not restored properly?)') |
# The browser test runner synthesizes methods with the exact name |
@@ -227,7 +227,7 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
url = self.UrlOfStaticFilePath(test_path) |
tab = self.tab |
tab.Navigate(url, script_to_evaluate_on_commit=harness_script) |
- tab.action_runner.WaitForJavaScriptCondition2( |
+ tab.action_runner.WaitForJavaScriptCondition( |
'window.domAutomationController._finished') |
def _ContextLost_WebGLContextLostFromQuantity(self, test_path): |
@@ -248,7 +248,7 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
# doesn't crash. |
tab = self.tab |
dummy_tab = tab.browser.tabs.New() |
- tab.EvaluateJavaScript2('loseContextUsingExtension()') |
+ tab.EvaluateJavaScript('loseContextUsingExtension()') |
tab.Activate() |
self._WaitForTabAndCheckCompletion() |