From 8bad4795cbf8afd699f6c3dc111c8dba11a280d3 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Thu, 15 Jul 2010 17:00:02 +0000 Subject: Fix bad merge in ClientSocketPoolBaseHelper. BUG=none TEST=none Review URL: http://codereview.chromium.org/3013001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52490 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket/client_socket_pool_base.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'net') diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index 5b116e6..019452c 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -627,12 +627,6 @@ void ClientSocketPoolBaseHelper::OnConnectJobComplete( } r->net_log().EndEvent(NetLog::TYPE_SOCKET_POOL, new NetLogIntegerParameter("net_error", result)); - if (socket.get()) { - handed_out_socket = true; - HandOutSocket( - socket.release(), false /* unused socket */, r->handle(), - base::TimeDelta(), &group, r->net_log()); - } r->callback()->Run(result); } else { RemoveConnectJob(job, &group); -- cgit v1.1