Chromium Code Reviews| Index: chrome/browser/net/connection_tester.cc |
| diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc |
| index 00e7482d8e9062cda4f1c80383d70c8638ec0e7e..ced2e151dd21613f7b214ba2909b39c5210f4780 100644 |
| --- a/chrome/browser/net/connection_tester.cc |
| +++ b/chrome/browser/net/connection_tester.cc |
| @@ -227,6 +227,10 @@ class ExperimentURLRequestContext : public net::URLRequestContext { |
| // code. |
| int CreateFirefoxProxyConfigService( |
| scoped_ptr<net::ProxyConfigService>* config_service) { |
| +#if defined(OS_ANDROID) |
| + // Chrome on Android does not support Firefox settings. |
| + return net::ERR_FAILED; |
|
Yaron
2012/03/01 02:20:31
Looking above, it seems like theres' precedent for
|
| +#else |
| // Fetch Firefox's proxy settings (can fail if Firefox is not installed). |
| FirefoxProxySettings firefox_settings; |
| if (!FirefoxProxySettings::GetSettings(&firefox_settings)) |
| @@ -242,6 +246,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext { |
| } |
| return net::ERR_FAILED; |
| +#endif |
| } |
| const scoped_refptr<net::URLRequestContext> proxy_request_context_; |