Index: tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py |
diff --git a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py |
index cbf67c3b7ee13d7bf9d55b02a76ec7afa45da655..9eed663a48cca7938d8066f1c8f32a6bf51a66d7 100644 |
--- a/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py |
+++ b/tools/telemetry/telemetry/core/backends/chrome/chrome_browser_backend.py |
@@ -95,7 +95,11 @@ class ChromeBrowserBackend(browser_backend.BrowserBackend): |
args.append('--metrics-recording-only') |
args.append('--no-default-browser-check') |
args.append('--no-first-run') |
- args.append('--no-proxy-server') |
+ # Set --no-proxy-server to work around some XP issues unless |
+ # some other flag indicates a proxy is needed. |
+ if not '--enable-spdy-proxy-auth' in args: |
+ args.append('--no-proxy-server') |
+ |
if self.browser_options.netsim: |
args.append('--ignore-certificate-errors') |
elif self.browser_options.wpr_mode != wpr_modes.WPR_OFF: |