summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 02:24:36 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 02:24:36 +0000
commitfa7f747461742b187b57041adff55f1e334285ba (patch)
tree2be55354d72085ebedff6cea228481cdb56fa56b /net
parentacfb1835eb14b93ce1ad87be864c16a70c46f10f (diff)
downloadchromium_src-fa7f747461742b187b57041adff55f1e334285ba.zip
chromium_src-fa7f747461742b187b57041adff55f1e334285ba.tar.gz
chromium_src-fa7f747461742b187b57041adff55f1e334285ba.tar.bz2
Fix a leak introduced by r131509
BUG=none TEST=memory bots are happy bots Review URL: https://chromiumcodereview.appspot.com/10014016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/socket/ssl_client_socket_unittest.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 4e0fd86..10f33ec 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -33,6 +33,7 @@ class SSLClientSocketTest : public PlatformTest {
: socket_factory_(net::ClientSocketFactory::GetDefaultFactory()),
cert_verifier_(new net::MockCertVerifier) {
cert_verifier_->set_default_result(net::OK);
+ context_.cert_verifier = cert_verifier_.get();
}
protected:
@@ -40,17 +41,16 @@ class SSLClientSocketTest : public PlatformTest {
net::StreamSocket* transport_socket,
const net::HostPortPair& host_and_port,
const net::SSLConfig& ssl_config) {
- net::SSLClientSocketContext context;
- context.cert_verifier = cert_verifier_.get();
return socket_factory_->CreateSSLClientSocket(transport_socket,
host_and_port,
ssl_config,
NULL,
- context);
+ context_);
}
net::ClientSocketFactory* socket_factory_;
scoped_ptr<net::MockCertVerifier> cert_verifier_;
+ net::SSLClientSocketContext context_;
};
//-----------------------------------------------------------------------------
@@ -759,8 +759,9 @@ TEST_F(SSLClientSocketTest, ClientSocketHandleNotFromPool) {
socket_handle->set_socket(transport);
scoped_ptr<net::SSLClientSocket> sock(
- CreateSSLClientSocket(transport, test_server.host_port_pair(),
- kDefaultSSLConfig));
+ socket_factory_->CreateSSLClientSocket(
+ socket_handle, test_server.host_port_pair(), kDefaultSSLConfig,
+ NULL, context_));
EXPECT_FALSE(sock->IsConnected());
rv = sock->Connect(callback.callback());