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

content/test/gpu/gpu_tests/maps_integration_test.py

 # Copyright 2017 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 json
 import os
 import sys
 
 from gpu_tests import gpu_integration_test
 from gpu_tests import cloud_storage_integration_test_base
 from gpu_tests import maps_expectations
 from gpu_tests import path_util
 
-import py_utils
 from py_utils import cloud_storage
 
 data_path = os.path.join(path_util.GetChromiumSrcDir(),
                          'content', 'test', 'gpu', 'page_sets', 'data')
 
 class MapsIntegrationTest(
     cloud_storage_integration_test_base.CloudStorageIntegrationTestBase):
   """Google Maps pixel tests.
 
   Note: the WPR for this test was recorded from the smoothness.maps
@@ skipping 55 matching lines @@
           'http://map-test/performance.html',
           ('maps_004_expectations.json'))
 
   def _ReadPixelExpectations(self, expectations_file):
     expectations_path = os.path.join(data_path, expectations_file)
     with open(expectations_path, 'r') as f:
       json_contents = json.load(f)
     return json_contents
 
   def _SpinWaitOnRAF(self, iterations, timeout=60):
-    tab = self.tab
-    waitScript = r"""
-      window.__spinWaitOnRAFDone = false;
-      var iterationsLeft = %d;
+    self.tab.ExecuteJavaScript2("""
+        window.__spinWaitOnRAFDone = false;
+        var iterationsLeft = {{ iterations }};
 
-      function spin() {
-        iterationsLeft--;
-        if (iterationsLeft == 0) {
-          window.__spinWaitOnRAFDone = true;
-          return;
+        function spin() {
+          iterationsLeft--;
+          if (iterationsLeft == 0) {
+            window.__spinWaitOnRAFDone = true;
+            return;
+          }
+          window.requestAnimationFrame(spin);
         }
         window.requestAnimationFrame(spin);
-      }
-      window.requestAnimationFrame(spin);
-    """ % iterations
-
-    def IsWaitComplete():
-      return tab.EvaluateJavaScript('window.__spinWaitOnRAFDone')
-
-    tab.ExecuteJavaScript(waitScript)
-    py_utils.WaitFor(IsWaitComplete, timeout)
+        """, iterations=iterations)
+    self.tab.WaitForJavaScriptCondition2(
+        'window.__spinWaitOnRAFDone', timeout=timeout)
 
   def RunActualGpuTest(self, url, *args):
     tab = self.tab
     pixel_expectations_file = args[0]
     action_runner = tab.action_runner
     action_runner.Navigate(url)
-    action_runner.WaitForJavaScriptCondition(
-        'window.testDone', timeout_in_seconds=180)
+    action_runner.WaitForJavaScriptCondition2(
+        'window.testDone', timeout=180)
 
     # TODO(kbr): This should not be necessary, but it's not clear if the test
     # is failing on the bots in its absence. Remove once we can verify that
     # it's safe to do so.
     self._SpinWaitOnRAF(3)
 
     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')
     print 'Maps\' devicePixelRatio is ' + str(dpr)
     # Even though the Maps test uses a fixed devicePixelRatio so that
     # it fetches all of the map tiles at the same resolution, on two
     # different devices with the same devicePixelRatio (a Retina
     # MacBook Pro and a Nexus 9), different scale factors of the final
     # screenshot are observed. Hack around this by specifying a scale
     # factor for these bots in the test expectations. This relies on
     # the test-machine-name argument being specified on the command
     # line.
     expected = self._ReadPixelExpectations(pixel_expectations_file)
     self._ValidateScreenshotSamples(tab, url, screenshot, expected, dpr)
 
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])