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..fb3ae3d50895ff3a5d8b33366185bb7e07cf5b62 100644 |
| --- a/chrome/browser/net/connection_tester.cc |
| +++ b/chrome/browser/net/connection_tester.cc |
| @@ -12,7 +12,9 @@ |
| #include "base/message_loop.h" |
| #include "base/threading/thread_restrictions.h" |
| #include "base/utf_string_conversions.h" |
| +#if !defined(OS_ANDROID) |
|
Yaron
2012/03/01 17:38:43
NIT: platform-specific includes are supposed to co
|
| #include "chrome/browser/importer/firefox_proxy_settings.h" |
| +#endif |
| #include "chrome/common/chrome_switches.h" |
| #include "net/base/cert_verifier.h" |
| #include "net/base/cookie_monster.h" |
| @@ -227,6 +229,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_NOT_IMPLEMENTED; |
| +#else |
| // Fetch Firefox's proxy settings (can fail if Firefox is not installed). |
| FirefoxProxySettings firefox_settings; |
| if (!FirefoxProxySettings::GetSettings(&firefox_settings)) |
| @@ -242,6 +248,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext { |
| } |
| return net::ERR_FAILED; |
| +#endif |
| } |
| const scoped_refptr<net::URLRequestContext> proxy_request_context_; |