Index: content/test/gpu/gpu_tests/gpu_process_integration_test.py |
diff --git a/content/test/gpu/gpu_tests/gpu_process_integration_test.py b/content/test/gpu/gpu_tests/gpu_process_integration_test.py |
index 4b8608fd8d2032a05ee9da3c4468376c5ec98b25..8c7fd08e9e3fbfd34b9a3efc46fbeb0fafb2652d 100644 |
--- a/content/test/gpu/gpu_tests/gpu_process_integration_test.py |
+++ b/content/test/gpu/gpu_tests/gpu_process_integration_test.py |
@@ -141,22 +141,22 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
def _NavigateAndWait(self, test_path): |
self._Navigate(test_path) |
- self.tab.action_runner.WaitForJavaScriptCondition2( |
+ self.tab.action_runner.WaitForJavaScriptCondition( |
'window.domAutomationController._finished', timeout=10) |
def _VerifyGpuProcessPresent(self): |
tab = self.tab |
- if not tab.EvaluateJavaScript2('chrome.gpuBenchmarking.hasGpuChannel()'): |
+ if not tab.EvaluateJavaScript('chrome.gpuBenchmarking.hasGpuChannel()'): |
self.fail('No GPU channel detected') |
def _ValidateDriverBugWorkaroundsImpl(self, process_kind, is_expected, |
workaround_name): |
tab = self.tab |
if process_kind == "browser_process": |
- gpu_driver_bug_workarounds = tab.EvaluateJavaScript2( |
+ gpu_driver_bug_workarounds = tab.EvaluateJavaScript( |
'GetDriverBugWorkarounds()') |
elif process_kind == "gpu_process": |
- gpu_driver_bug_workarounds = tab.EvaluateJavaScript2( |
+ gpu_driver_bug_workarounds = tab.EvaluateJavaScript( |
'chrome.gpuBenchmarking.getGpuDriverBugWorkarounds()') |
is_present = workaround_name in gpu_driver_bug_workarounds |
@@ -170,7 +170,7 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
if failure: |
print 'Test failed. Printing page contents:' |
- print tab.EvaluateJavaScript2('document.body.innerHTML') |
+ print tab.EvaluateJavaScript('document.body.innerHTML') |
self.fail('%s %s in %s workarounds: %s' |
% (workaround_name, error_message, process_kind, |
gpu_driver_bug_workarounds)) |
@@ -198,25 +198,25 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
def _CompareAndCaptureDriverBugWorkarounds(self): |
tab = self.tab |
- if not tab.EvaluateJavaScript2('chrome.gpuBenchmarking.hasGpuProcess()'): |
+ if not tab.EvaluateJavaScript('chrome.gpuBenchmarking.hasGpuProcess()'): |
self.fail('No GPU process detected') |
- if not tab.EvaluateJavaScript2('chrome.gpuBenchmarking.hasGpuChannel()'): |
+ if not tab.EvaluateJavaScript('chrome.gpuBenchmarking.hasGpuChannel()'): |
self.fail('No GPU channel detected') |
- browser_list = tab.EvaluateJavaScript2('GetDriverBugWorkarounds()') |
- gpu_list = tab.EvaluateJavaScript2( |
+ browser_list = tab.EvaluateJavaScript('GetDriverBugWorkarounds()') |
+ gpu_list = tab.EvaluateJavaScript( |
'chrome.gpuBenchmarking.getGpuDriverBugWorkarounds()') |
diff = set(browser_list).symmetric_difference(set(gpu_list)) |
if len(diff) > 0: |
print 'Test failed. Printing page contents:' |
- print tab.EvaluateJavaScript2('document.body.innerHTML') |
+ print tab.EvaluateJavaScript('document.body.innerHTML') |
self.fail('Browser and GPU process list of driver bug' |
'workarounds are not equal: %s != %s, diff: %s' % |
(browser_list, gpu_list, list(diff))) |
- basic_infos = tab.EvaluateJavaScript2('browserBridge.gpuInfo.basic_info') |
+ basic_infos = tab.EvaluateJavaScript('browserBridge.gpuInfo.basic_info') |
disabled_gl_extensions = None |
for info in basic_infos: |
if info['description'].startswith('Disabled Extensions'): |
@@ -228,7 +228,7 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
def _VerifyActiveAndInactiveGPUs( |
self, expected_active_gpu, expected_inactive_gpus): |
tab = self.tab |
- basic_infos = tab.EvaluateJavaScript2('browserBridge.gpuInfo.basic_info') |
+ basic_infos = tab.EvaluateJavaScript('browserBridge.gpuInfo.basic_info') |
active_gpu = [] |
inactive_gpus = [] |
index = 0 |
@@ -316,7 +316,7 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
'--gpu-testing-vendor-id=0x8086', |
'--gpu-testing-device-id=0x0116']) |
self._Navigate(test_path) |
- if self.tab.EvaluateJavaScript2('chrome.gpuBenchmarking.hasGpuProcess()'): |
+ if self.tab.EvaluateJavaScript('chrome.gpuBenchmarking.hasGpuProcess()'): |
self.fail('GPU process detected') |
def _GpuProcess_driver_bug_workarounds_in_gpu_process(self, test_path): |
@@ -340,7 +340,7 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
'on llvmpipe (LLVM 3.4, 256 bits)', |
'--gpu-testing-gl-version="3.0 Mesa 11.2"']) |
self._Navigate(test_path) |
- feature_status_list = self.tab.EvaluateJavaScript2( |
+ feature_status_list = self.tab.EvaluateJavaScript( |
'browserBridge.gpuInfo.featureStatus.featureStatus') |
result = True |
for name, status in feature_status_list.items(): |
@@ -435,14 +435,14 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
tab = self.tab |
if len(diff) > 0: |
print 'Test failed. Printing page contents:' |
- print tab.EvaluateJavaScript2('document.body.innerHTML') |
+ print tab.EvaluateJavaScript('document.body.innerHTML') |
self.fail( |
'GPU process and expected list of driver bug ' |
'workarounds are not equal: %s != %s, diff: %s' % |
(recorded_workarounds, new_workarounds, list(diff))) |
if recorded_disabled_gl_extensions != new_disabled_gl_extensions: |
print 'Test failed. Printing page contents:' |
- print tab.EvaluateJavaScript2('document.body.innerHTML') |
+ print tab.EvaluateJavaScript('document.body.innerHTML') |
self.fail( |
'The expected disabled gl extensions are ' |
'incorrect: %s != %s:' % |
@@ -453,7 +453,7 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
'--disable-gpu', |
'--skip-gpu-data-loading']) |
self._Navigate(test_path) |
- if self.tab.EvaluateJavaScript2('chrome.gpuBenchmarking.hasGpuProcess()'): |
+ if self.tab.EvaluateJavaScript('chrome.gpuBenchmarking.hasGpuProcess()'): |
self.fail('GPU process detected') |
def _GpuProcess_identify_active_gpu1(self, test_path): |