diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 13:22:01 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 13:22:01 +0000 |
commit | a154ba9bc83408f1f27b27c4dce6af71486b9166 (patch) | |
tree | 8efdb3c6a96e3c55922d6fcba78c2de7900a47da /net/http | |
parent | 328653c2e32b570d8cdbef3938b8b834f3b5abfb (diff) | |
download | chromium_src-a154ba9bc83408f1f27b27c4dce6af71486b9166.zip chromium_src-a154ba9bc83408f1f27b27c4dce6af71486b9166.tar.gz chromium_src-a154ba9bc83408f1f27b27c4dce6af71486b9166.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r-- | net/http/http_network_layer_unittest.cc | 12 | ||||
-rw-r--r-- | net/http/http_network_transaction_unittest.cc | 6 | ||||
-rw-r--r-- | net/http/http_proxy_client_socket_pool_unittest.cc | 2 |
3 files changed, 10 insertions, 10 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; diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 41873da..c483000 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -110,7 +110,7 @@ struct SessionDependencies { // Default set of dependencies -- "null" proxy service. SessionDependencies() : host_resolver(new MockHostResolver), - proxy_service(ProxyService::CreateNull()), + proxy_service(ProxyService::CreateDirect()), ssl_config_service(new SSLConfigServiceDefaults), http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault()), spdy_session_pool(new SpdySessionPool(NULL)), @@ -6521,7 +6521,7 @@ TEST_F(HttpNetworkTransactionTest, GenerateAuthToken) { session_deps.proxy_service = CreateFixedProxyService(test_config.proxy_url); } else { - session_deps.proxy_service = ProxyService::CreateNull(); + session_deps.proxy_service = ProxyService::CreateDirect(); } HttpRequestInfo request; @@ -6600,7 +6600,7 @@ TEST_F(HttpNetworkTransactionTest, MultiRoundAuth) { HttpAuthHandlerMock::Factory* auth_factory( new HttpAuthHandlerMock::Factory()); session_deps.http_auth_handler_factory.reset(auth_factory); - session_deps.proxy_service = ProxyService::CreateNull(); + session_deps.proxy_service = ProxyService::CreateDirect(); session_deps.host_resolver->rules()->AddRule("www.example.com", "10.0.0.1"); session_deps.host_resolver->set_synchronous_mode(true); diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc index dcc893e..a1190cb 100644 --- a/net/http/http_proxy_client_socket_pool_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_unittest.cc @@ -52,7 +52,7 @@ class HttpProxyClientSocketPoolTest : public TestWithHttpParam { kMaxSocketsPerGroup, tcp_histograms_, &tcp_client_socket_factory_)), http_auth_handler_factory_(HttpAuthHandlerFactory::CreateDefault()), session_(new HttpNetworkSession(new MockHostResolver, - ProxyService::CreateNull(), + ProxyService::CreateDirect(), &socket_factory_, new SSLConfigServiceDefaults, new SpdySessionPool(NULL), |