diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 05:10:02 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 05:10:02 +0000 |
| commit | ebeefff3de6b22ea1447f768399f5fba14820ca8 (patch) | |
| tree | b8923c352b5c316a38a40a14985e87ba7c778b10 /net/proxy | |
| parent | 38c56c73e185a306b66a9d10ce37a06bf34c70d0 (diff) | |
| download | chromium_src-ebeefff3de6b22ea1447f768399f5fba14820ca8.zip chromium_src-ebeefff3de6b22ea1447f768399f5fba14820ca8.tar.gz chromium_src-ebeefff3de6b22ea1447f768399f5fba14820ca8.tar.bz2 | |
Reland 59362 - net: Rename ProxyService::CreateNull to ProxyService::CreateDirect.
(Note: This was a TODO for eroman).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3336021
Revert Review URL: http://codereview.chromium.org/3444001/show
TBR=eroman@chromium.org
Fix the bad git svn rebase (that caused a bad merge, that integrates other files
in the original cl, now this should be fixed).
Review URL: http://codereview.chromium.org/3413008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59481 0039d316-1c4b-4281-b951-d872f2087c98
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. |