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 /chrome_frame | |
| 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 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/test_server_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc index 84ca924..dbbbd20 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/chrome_frame/test/test_server_test.cc @@ -64,7 +64,7 @@ class URLRequestTestContext : public URLRequestContext { host_resolver_ = net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, NULL); - proxy_service_ = net::ProxyService::CreateNull(); + proxy_service_ = net::ProxyService::CreateDirect(); ssl_config_service_ = new net::SSLConfigServiceDefaults; http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(); http_transaction_factory_ = new net::HttpCache( |