summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 05:10:02 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 05:10:02 +0000
commitebeefff3de6b22ea1447f768399f5fba14820ca8 (patch)
treeb8923c352b5c316a38a40a14985e87ba7c778b10 /net/tools
parent38c56c73e185a306b66a9d10ce37a06bf34c70d0 (diff)
downloadchromium_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/tools')
-rw-r--r--net/tools/fetch/fetch_client.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc
index 933f676..9adf20b 100644
--- a/net/tools/fetch/fetch_client.cc
+++ b/net/tools/fetch/fetch_client.cc
@@ -140,7 +140,7 @@ int main(int argc, char**argv) {
NULL));
scoped_refptr<net::ProxyService> proxy_service(
- net::ProxyService::CreateNull());
+ net::ProxyService::CreateDirect());
scoped_refptr<net::SSLConfigService> ssl_config_service(
net::SSLConfigService::CreateSystemSSLConfigService());
net::HttpTransactionFactory* factory = NULL;