Reland 54771 (and 54795) To enable TCP Preconnection by default...

net/socket/client_socket_handle.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/client_socket_handle.h"
 
 #include "base/compiler_specific.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "net/base/net_errors.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/client_socket_pool_histograms.h"
 
 namespace net {
 
 ClientSocketHandle::ClientSocketHandle()
     : is_initialized_(false),
       is_reused_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           callback_(this, &ClientSocketHandle::OnIOComplete)),
       is_ssl_error_(false) {}
 
 ClientSocketHandle::~ClientSocketHandle() {
   Reset();
+  // Manually release socket, so that we also cause state to be recorded into
+  // associated socket_ as needed.
+  release_socket();
 }
 
 void ClientSocketHandle::Reset() {
   ResetInternal(true);
   ResetErrorState();
 }
 
 void ClientSocketHandle::ResetInternal(bool cancel) {
   if (group_name_.empty())  // Was Init called?
     return;
@@ skipping 78 matching lines @@
   // TODO(eroman): This logging is not complete, in particular set_socket() and
   // release() socket. It ends up working though, since those methods are being
   // used to layer sockets (and the destination sources are the same).
   DCHECK(socket_.get());
   socket_->NetLog().BeginEvent(
       NetLog::TYPE_SOCKET_IN_USE,
       new NetLogSourceParameter("source_dependency", requesting_source_));
 }
 
 }  // namespace net