BASELINE: Update Chromium to 58.0.3029.54

Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

1 files changed, 7 insertions, 4 deletions

diff --git a/chromium/tools/chrome_proxy/common/chrome_proxy_measurements.py b/chromium/tools/chrome_proxy/common/chrome_proxy_measurements.py
index 36b06143f14..b62920831eb 100644
--- a/chromium/tools/chrome_proxy/common/chrome_proxy_measurements.py
+++ b/chromium/tools/chrome_proxy/common/chrome_proxy_measurements.py
@@ -51,14 +51,16 @@ def WaitForViaHeader(tab, url="http://check.googlezip.net/test.html"):
     '</body></html>'))
 
   # Ensure the page has finished loading before attempting the DRP check.
-  tab.WaitForJavaScriptExpression('performance.timing.loadEventEnd', 60)
+  tab.WaitForJavaScriptCondition('performance.timing.loadEventEnd', timeout=60)
 
   expected_via_header = metrics.CHROME_PROXY_VIA_HEADER
   if ChromeProxyValidation.extra_via_header:
     expected_via_header = ChromeProxyValidation.extra_via_header
 
-  tab.WaitForJavaScriptExpression(
-      'PollDRPCheck("%s", "%s")' % (url, expected_via_header), 60)
+  tab.WaitForJavaScriptCondition(
+      'PollDRPCheck({{ url }}, {{ via_header }})',
+      url=url, via_header=expected_via_header,
+      timeout=60)
 
 
 class ChromeProxyValidation(legacy_page_test.LegacyPageTest):
@@ -100,7 +102,8 @@ class ChromeProxyValidation(legacy_page_test.LegacyPageTest):
   def ValidateAndMeasurePage(self, page, tab, results):
     self._page = page
     # Wait for the load event.
-    tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300)
+    tab.WaitForJavaScriptCondition(
+        'performance.timing.loadEventStart', timeout=300)
     assert self._metrics
     self._metrics.Stop(page, tab)
     if ChromeProxyValidation.extra_via_header: