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/http/http_network_layer_unittest.cc | |
| 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/http/http_network_layer_unittest.cc')
| -rw-r--r-- | net/http/http_network_layer_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc index 274d2dc..27822ed 100644 --- a/net/http/http_network_layer_unittest.cc +++ b/net/http/http_network_layer_unittest.cc @@ -17,8 +17,8 @@ class HttpNetworkLayerTest : public PlatformTest { TEST_F(HttpNetworkLayerTest, CreateAndDestroy) { net::HttpNetworkLayer factory(NULL, new net::MockHostResolver, - net::ProxyService::CreateNull(), new net::SSLConfigServiceDefaults, NULL, - NULL, NULL); + net::ProxyService::CreateDirect(), new net::SSLConfigServiceDefaults, + NULL, NULL, NULL); scoped_ptr<net::HttpTransaction> trans; int rv = factory.CreateTransaction(&trans); @@ -28,8 +28,8 @@ TEST_F(HttpNetworkLayerTest, CreateAndDestroy) { TEST_F(HttpNetworkLayerTest, Suspend) { net::HttpNetworkLayer factory(NULL, new net::MockHostResolver, - net::ProxyService::CreateNull(), new net::SSLConfigServiceDefaults, NULL, - NULL, NULL); + net::ProxyService::CreateDirect(), new net::SSLConfigServiceDefaults, + NULL, NULL, NULL); scoped_ptr<net::HttpTransaction> trans; int rv = factory.CreateTransaction(&trans); @@ -68,8 +68,8 @@ TEST_F(HttpNetworkLayerTest, GET) { mock_socket_factory.AddSocketDataProvider(&data); net::HttpNetworkLayer factory(&mock_socket_factory, new net::MockHostResolver, - net::ProxyService::CreateNull(), new net::SSLConfigServiceDefaults, NULL, - NULL, NULL); + net::ProxyService::CreateDirect(), new net::SSLConfigServiceDefaults, + NULL, NULL, NULL); TestCompletionCallback callback; |