[Telemetry refactor] Migrate clients to new JavaScript API (batch 3)

content/test/gpu/gpu_tests/pixel_integration_test.py

 # Copyright 2016 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.
 import glob
 import logging
 import os
 import re
 import sys
 
 from gpu_tests import gpu_integration_test
@@ skipping 113 matching lines @@
   def RunActualGpuTest(self, test_path, *args):
     page = args[0]
     # Some pixel tests require non-standard browser arguments. Need to
     # check before running each page that it can run in the current
     # browser instance.
     self.RestartBrowserIfNecessaryWithArgs(page.browser_args)
     url = self.UrlOfStaticFilePath(test_path)
     # 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,
           page.test_rect[2] * dpr, page.test_rect[3] * dpr)
     if page.expected_colors:
       # Use expected colors instead of ref images for validation.
       self._ValidateScreenshotSamples(
           tab, page.name, screenshot, page.expected_colors, dpr)
       return
     image_name = self._UrlToImageName(page.name)
@@ skipping 70 matching lines @@
 
     print ('Reference image not found. Writing tab contents as reference to: ' +
            image_path)
 
     self._WriteImage(image_path, screenshot)
     return screenshot
 
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])