summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_client_socket_pool_unittest.cc
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 14:56:27 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 14:56:27 +0000
commit88a2c4078d51ef9c5aec9270d8f72e517ad94e4e (patch)
treea81dd5083fccc7f60028a25ecb554916ba26cf80 /net/socket/ssl_client_socket_pool_unittest.cc
parentdd43578d4929c6502944871bc752905d5b61566f (diff)
downloadchromium_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/socket/ssl_client_socket_pool_unittest.cc')
-rw-r--r--net/socket/ssl_client_socket_pool_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 378356d..90eb319 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -37,7 +37,7 @@ class SSLClientSocketPoolTest : public ClientSocketPoolTest {
SSLClientSocketPoolTest()
: http_auth_handler_factory_(HttpAuthHandlerFactory::CreateDefault()),
session_(new HttpNetworkSession(new MockHostResolver,
- ProxyService::CreateDirect(),
+ ProxyService::CreateNull(),
&socket_factory_,
new SSLConfigServiceDefaults,
new SpdySessionPool(NULL),