diff options
Diffstat (limited to 'chromium/tools/chrome_proxy')
| -rw-r--r-- | chromium/tools/chrome_proxy/webdriver/decorators.py | 2 | ||||
| -rw-r--r-- | chromium/tools/chrome_proxy/webdriver/subresource_redirect.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chromium/tools/chrome_proxy/webdriver/decorators.py b/chromium/tools/chrome_proxy/webdriver/decorators.py index 33a086beeba..8cdcdf568fa 100644 --- a/chromium/tools/chrome_proxy/webdriver/decorators.py +++ b/chromium/tools/chrome_proxy/webdriver/decorators.py @@ -82,7 +82,7 @@ chrome_version = None def GetChromeVersion(): with TestDriver() as t: - t.LoadURL('http://check.googlezip.net/connect') + t.LoadURL('about:blank') ua = t.ExecuteJavascriptStatement('navigator.userAgent') match = re.search('Chrome/[0-9\.]+', ua) if not match: diff --git a/chromium/tools/chrome_proxy/webdriver/subresource_redirect.py b/chromium/tools/chrome_proxy/webdriver/subresource_redirect.py index eb42b2aaac4..7ef4ed0537f 100644 --- a/chromium/tools/chrome_proxy/webdriver/subresource_redirect.py +++ b/chromium/tools/chrome_proxy/webdriver/subresource_redirect.py @@ -14,6 +14,7 @@ class SubresourceRedirect(IntegrationTest): def enableSubresourceRedirectFeature(self, test_driver): test_driver.EnableChromeFeature('SubresourceRedirect<SubresourceRedirect') + test_driver.AddChromeArg('--force-variation-ids=-1') test_driver.AddChromeArg('--force-fieldtrials=SubresourceRedirect/Enabled') test_driver.AddChromeArg( '--force-fieldtrial-params=' @@ -24,6 +25,7 @@ class SubresourceRedirect(IntegrationTest): 'OptimizationHintsFetchingAnonymousDataConsent') test_driver.AddChromeArg('--enable-spdy-proxy-auth') test_driver.AddChromeArg('--dont-require-litepage-redirect-infobar') + test_driver.AddChromeArg('--override-https-image-compression-infobar') # Verifies that image subresources on a page have been returned # from the compression server. @@ -39,6 +41,7 @@ class SubresourceRedirect(IntegrationTest): image_responses = 0 for response in test_driver.GetHTTPResponses(): + print response content_type = '' if 'content-type' in response.response_headers: content_type = response.response_headers['content-type'] |