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

net/socket/client_socket_handle.h

 // 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.
 
 #ifndef NET_SOCKET_CLIENT_SOCKET_HANDLE_H_
 #define NET_SOCKET_CLIENT_SOCKET_HANDLE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 114 matching lines @@
     return ssl_error_response_info_;
   }
   ClientSocketHandle* release_pending_http_proxy_connection() {
     return pending_http_proxy_connection_.release();
   }
 
   // These may only be used if is_initialized() is true.
   const std::string& group_name() const { return group_name_; }
   int id() const { return pool_id_; }
   ClientSocket* socket() { return socket_.get(); }
-  ClientSocket* release_socket() { return socket_.release(); }
+  ClientSocket* release_socket() {
+    UpdateConnectivityStateForSocket();
+    return socket_.release();
+  }
   bool is_reused() const { return is_reused_; }
   base::TimeDelta idle_time() const { return idle_time_; }
   SocketReuseType reuse_type() const {
     if (is_reused()) {
       return REUSED_IDLE;
     } else if (idle_time() == base::TimeDelta()) {
       return UNUSED;
     } else {
       return UNUSED_IDLE;
     }
@@ skipping 21 matching lines @@
   void HandleInitCompletion(int result);
 
   // Resets the state of the ClientSocketHandle.  |cancel| indicates whether or
   // not to try to cancel the request with the ClientSocketPool.  Does not
   // reset the supplemental error state.
   void ResetInternal(bool cancel);
 
   // Resets the supplemental error state.
   void ResetErrorState();
 
+  // Update the base class to record things like whether we've ever transmitted
+  // data, and whether the connection was able to be established.  We use this
+  // data to construct histograms indicating whether a speculative connection
+  // was ever used, etc., when the ClientSocket is eventually discarded.
+  void UpdateConnectivityStateForSocket() const {
+    if (socket_.get())
+      socket_->UpdateConnectivityState(is_reused());
+  }
+
   bool is_initialized_;
   scoped_refptr<ClientSocketPool> pool_;
   scoped_ptr<ClientSocket> socket_;
   std::string group_name_;
   bool is_reused_;
   CompletionCallbackImpl<ClientSocketHandle> callback_;
   CompletionCallback* user_callback_;
   base::TimeDelta idle_time_;
   int pool_id_;  // See ClientSocketPool::ReleaseSocket() for an explanation.
   bool is_ssl_error_;
@@ skipping 33 matching lines @@
     user_callback_ = callback;
   } else {
     HandleInitCompletion(rv);
   }
   return rv;
 }
 
 }  // namespace net
 
 #endif  // NET_SOCKET_CLIENT_SOCKET_HANDLE_H_