Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1668)

Unified Diff: content/test/gpu/gpu_tests/pixel_integration_test.py

Issue 2672803002: [Telemetry refactor] Migrate clients to new JavaScript API (batch 3) (Closed)
Patch Set: add comment on tools/android Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/test/gpu/gpu_tests/pixel_integration_test.py
diff --git a/content/test/gpu/gpu_tests/pixel_integration_test.py b/content/test/gpu/gpu_tests/pixel_integration_test.py
index e6bcac292336fb9845073f9c32588b30015b922f..66b6c339ac24016265446007c19ea9c1aba30b8e 100644
--- a/content/test/gpu/gpu_tests/pixel_integration_test.py
+++ b/content/test/gpu/gpu_tests/pixel_integration_test.py
@@ -131,16 +131,16 @@ class PixelIntegrationTest(
# This property actually comes off the class, not 'self'.
tab = self.tab
tab.Navigate(url, script_to_evaluate_on_commit=test_harness_script)
- tab.action_runner.WaitForJavaScriptCondition(
- 'domAutomationController._finished', timeout_in_seconds=300)
- if not tab.EvaluateJavaScript('domAutomationController._succeeded'):
+ tab.action_runner.WaitForJavaScriptCondition2(
+ 'domAutomationController._finished', timeout=300)
+ if not tab.EvaluateJavaScript2('domAutomationController._succeeded'):
self.fail('page indicated test failure')
if not tab.screenshot_supported:
self.fail('Browser does not support screenshot capture')
screenshot = tab.Screenshot(5)
if screenshot is None:
self.fail('Could not capture screenshot')
- dpr = tab.EvaluateJavaScript('window.devicePixelRatio')
+ dpr = tab.EvaluateJavaScript2('window.devicePixelRatio')
if page.test_rect:
screenshot = image_util.Crop(
screenshot, page.test_rect[0] * dpr, page.test_rect[1] * dpr,
« no previous file with comments | « content/test/gpu/gpu_tests/maps_integration_test.py ('k') | content/test/gpu/gpu_tests/screenshot_sync_integration_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698