diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-17 16:45:21 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-23 12:55:24 +0100 |
| commit | 2d04b11d60881569d8142cf294b1fad59f14a2a5 (patch) | |
| tree | 02d7a88b0ae4bdb01883875c1f4269742e8d1e5f /net/proxy | |
| parent | a2c3e02e3ebc98c8bf02760357608610033d19ef (diff) | |
| download | external_chromium-2d04b11d60881569d8142cf294b1fad59f14a2a5.zip external_chromium-2d04b11d60881569d8142cf294b1fad59f14a2a5.tar.gz external_chromium-2d04b11d60881569d8142cf294b1fad59f14a2a5.tar.bz2 | |
Removing the NullProxy, better Android implementation
The NullProxy was not used anymore.
Change-Id: I53e91650229e1b20e4376a13080e6681abd5c0a6
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_service.cc | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index d7fa0ef..e493623 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -83,19 +83,6 @@ const size_t kDefaultNumPacThreads = 4; // setups. const int64 kNumMillisToStallAfterNetworkChanges = 2000; -#ifdef ANDROID -// Config getter that fails every time. -class ProxyConfigServiceNull : public ProxyConfigService { - public: - // ProxyConfigService implementation: - virtual void AddObserver(Observer* observer) {} - virtual void RemoveObserver(Observer* observer) {} - virtual bool GetLatestProxyConfig(ProxyConfig* config) { - return false; - } -}; -#endif - // Config getter that always returns direct settings. class ProxyConfigServiceDirect : public ProxyConfigService { public: @@ -808,7 +795,11 @@ ProxyConfigService* ProxyService::CreateSystemProxyConfigService( NOTREACHED() << "ProxyConfigService for ChromeOS should be created in " << "chrome_url_request_context.cc::CreateProxyConfigService."; return NULL; -#elif defined(OS_LINUX) && !defined(ANDROID) +#elif defined(ANDROID) + NOTREACHED() << "ProxyConfigService for Android should be created in " + << "WebCache.cpp: WebCache::WebCache"; + return NULL; +#elif defined(OS_LINUX) ProxyConfigServiceLinux* linux_config_service = new ProxyConfigServiceLinux(); |