diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 14:56:27 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 14:56:27 +0000 |
| commit | 88a2c4078d51ef9c5aec9270d8f72e517ad94e4e (patch) | |
| tree | a81dd5083fccc7f60028a25ecb554916ba26cf80 /net/http/http_network_layer_unittest.cc | |
| parent | dd43578d4929c6502944871bc752905d5b61566f (diff) | |
| download | chromium_src-88a2c4078d51ef9c5aec9270d8f72e517ad94e4e.zip chromium_src-88a2c4078d51ef9c5aec9270d8f72e517ad94e4e.tar.gz chromium_src-88a2c4078d51ef9c5aec9270d8f72e517ad94e4e.tar.bz2 | |
Trying to green up the tree, lots of mac and win red around this cl.
Revert 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
TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/3444001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59373 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 27822ed..274d2dc 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::CreateDirect(), new net::SSLConfigServiceDefaults, - NULL, NULL, NULL); + net::ProxyService::CreateNull(), 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::CreateDirect(), new net::SSLConfigServiceDefaults, - NULL, NULL, NULL); + net::ProxyService::CreateNull(), 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::CreateDirect(), new net::SSLConfigServiceDefaults, - NULL, NULL, NULL); + net::ProxyService::CreateNull(), new net::SSLConfigServiceDefaults, NULL, + NULL, NULL); TestCompletionCallback callback; |