diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:00:02 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:00:02 +0000 |
| commit | 8bad4795cbf8afd699f6c3dc111c8dba11a280d3 (patch) | |
| tree | 828ed21d416050b555b3c00636beb1355ea4acd2 /net/socket/client_socket_pool_base.cc | |
| parent | 02ea78a3581af7b89ed4943b2e981aafa287e0e6 (diff) | |
| download | chromium_src-8bad4795cbf8afd699f6c3dc111c8dba11a280d3.zip chromium_src-8bad4795cbf8afd699f6c3dc111c8dba11a280d3.tar.gz chromium_src-8bad4795cbf8afd699f6c3dc111c8dba11a280d3.tar.bz2 | |
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
Diffstat (limited to 'net/socket/client_socket_pool_base.cc')
| -rw-r--r-- | net/socket/client_socket_pool_base.cc | 6 |
1 files changed, 0 insertions, 6 deletions
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); |