diff options
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_service.cc | 2 | ||||
| -rw-r--r-- | net/proxy/proxy_service.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index 3d1539f..c74b8b0 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -426,7 +426,7 @@ ProxyService* ProxyService::CreateFixed(const ProxyConfig& pc) { } // static -ProxyService* ProxyService::CreateNull() { +ProxyService* ProxyService::CreateDirect() { // Use direct connections. return new ProxyService(new ProxyConfigServiceDirect, new ProxyResolverNull, NULL); diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 990830e..8e53970 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -177,10 +177,8 @@ class ProxyService : public base::RefCountedThreadSafe<ProxyService>, // specified fixed settings. |pc| must not be NULL. static ProxyService* CreateFixed(const ProxyConfig& pc); - // Creates a proxy service that always fails to fetch the proxy configuration, - // so it falls back to direct connect. - // TODO(eroman): Rename to CreateDirect(). - static ProxyService* CreateNull(); + // Creates a proxy service that uses a DIRECT connection for all requests. + static ProxyService* CreateDirect(); // This method is used by tests to create a ProxyService that returns a // hardcoded proxy fallback list (|pac_string|) for every URL. |