Index: tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py |
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py |
index 55d1a3da0236dc5f0b7112c7276d71659326f2ee..7b07d760fe45992e18adf3d60980b472d2b32e46 100644 |
--- a/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py |
+++ b/tools/chrome_proxy/integration_tests/chrome_proxy_measurements.py |
@@ -47,7 +47,7 @@ class ChromeProxyDataSaving(legacy_page_test.LegacyPageTest): |
def ValidateAndMeasurePage(self, page, tab, results): |
# Wait for the load event. |
- tab.WaitForJavaScriptCondition2( |
+ tab.WaitForJavaScriptCondition( |
'performance.timing.loadEventStart', timeout=300) |
self._metrics.Stop(page, tab) |
self._metrics.AddResultsForDataSaving(tab, results) |
@@ -124,7 +124,7 @@ class ChromeProxyCorsBypass(ChromeProxyValidation): |
def ValidateAndMeasurePage(self, page, tab, results): |
# The test page sets window.xhrRequestCompleted to true when the XHR fetch |
# finishes. |
- tab.WaitForJavaScriptCondition2('window.xhrRequestCompleted', timeout=300) |
+ tab.WaitForJavaScriptCondition('window.xhrRequestCompleted', timeout=300) |
super(ChromeProxyCorsBypass, |
self).ValidateAndMeasurePage(page, tab, results) |
@@ -366,7 +366,7 @@ class ChromeProxyCacheLoFiDisabled(ChromeProxyValidation): |
def DidNavigateToPage(self, page, tab): |
if not self._is_lo_fi_enabled: |
- tab.ExecuteJavaScript2('window.location.reload()') |
+ tab.ExecuteJavaScript('window.location.reload()') |
util.WaitFor(tab.HasReachedQuiescence, 3) |
class ChromeProxyCacheProxyDisabled(ChromeProxyValidation): |
@@ -413,7 +413,7 @@ class ChromeProxyCacheProxyDisabled(ChromeProxyValidation): |
def DidNavigateToPage(self, page, tab): |
if not self._is_chrome_proxy_enabled: |
- tab.ExecuteJavaScript2('window.location.reload()') |
+ tab.ExecuteJavaScript('window.location.reload()') |
util.WaitFor(tab.HasReachedQuiescence, 3) |
class ChromeProxyLitePage(ChromeProxyValidation): |
@@ -502,7 +502,7 @@ class ChromeProxyHTTPToDirectFallback(ChromeProxyValidation): |
# cause a proxy fallback, and have this test run starting from the HTTP |
# fallback proxy. |
tab.Navigate(_TEST_SERVER_DEFAULT_URL) |
- tab.WaitForJavaScriptCondition2( |
+ tab.WaitForJavaScriptCondition( |
'performance.timing.loadEventStart', timeout=300) |
def AddResults(self, tab, results): |
@@ -604,7 +604,7 @@ class ChromeProxyQuicSmoke(legacy_page_test.LegacyPageTest): |
def ValidateAndMeasurePage(self, page, tab, results): |
# Wait for the load event. |
- tab.WaitForJavaScriptCondition2( |
+ tab.WaitForJavaScriptCondition( |
'performance.timing.loadEventStart', timeout=300) |
self._metrics.Stop(page, tab) |
page_to_metrics = { |
@@ -803,7 +803,7 @@ class ChromeProxyQuicTransaction(legacy_page_test.LegacyPageTest): |
def ValidateAndMeasurePage(self, page, tab, results): |
# Wait for the load event. |
- tab.WaitForJavaScriptCondition2( |
+ tab.WaitForJavaScriptCondition( |
'performance.timing.loadEventStart', timeout=300) |
self._metrics.Stop(page, tab) |
self._metrics.AddResultsForQuicTransaction(tab, results) |