Fix Net.Socket.IdleSocketTimeSaving histogram

net/socket/client_socket_pool_base.h

 // Copyright (c) 2012 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.
 //
 // A ClientSocketPoolBase is used to restrict the number of sockets open at
 // a time.  It also maintains a list of idle persistent sockets for reuse.
 // Subclasses of ClientSocketPool should compose ClientSocketPoolBase to handle
 // the core logic of (1) restricting the number of active (connected or
 // connecting) sockets per "group" (generally speaking, the hostname), (2)
 // maintaining a per-group list of idle, persistent sockets for reuse, and (3)
@@ skipping 259 matching lines @@
                       const Request& request,
                       int num_sockets);
 
   // See ClientSocketPool::CancelRequest for documentation on this function.
   void CancelRequest(const std::string& group_name,
                      ClientSocketHandle* handle);
 
   // See ClientSocketPool::ReleaseSocket for documentation on this function.
   void ReleaseSocket(const std::string& group_name,
                      std::unique_ptr<StreamSocket> socket,
-                     int id);
+                     int id,
+                     const LoadTimingInfo::ConnectTiming& connect_timing);
 
   // See ClientSocketPool::FlushWithError for documentation on this function.
   void FlushWithError(int error);
 
   // See ClientSocketPool::CloseIdleSockets for documentation on this function.
   void CloseIdleSockets();
 
   // See ClientSocketPool::IdleSocketCount() for documentation on this function.
   int idle_socket_count() const {
     return idle_socket_count_;
@@ skipping 72 matching lines @@
     // unread data would be mistaken for the beginning of the next response if
     // we were to use the socket for a new request.
     //
     // Note that a socket that has never been used before (like a preconnected
     // socket) may be used even with unread data.  This may be, e.g., a SPDY
     // SETTINGS frame.
     bool IsUsable() const;
 
     StreamSocket* socket;
     base::TimeTicks start_time;
+    // ConnectTiming of the connection establishment.
+    LoadTimingInfo::ConnectTiming connect_timing;
   };
 
   typedef PriorityQueue<const Request*> RequestQueue;
   typedef std::map<const ClientSocketHandle*, const Request*> RequestMap;
 
   // A Group is allocated per group_name when there are idle sockets or pending
   // requests.  Otherwise, the Group object is removed from the map.
   // |active_socket_count| tracks the number of sockets held by clients.
   class Group {
    public:
@@ skipping 162 matching lines @@
   // Assigns |socket| to |handle| and updates |group|'s counters appropriately.
   void HandOutSocket(std::unique_ptr<StreamSocket> socket,
                      ClientSocketHandle::SocketReuseType reuse_type,
                      const LoadTimingInfo::ConnectTiming& connect_timing,
                      ClientSocketHandle* handle,
                      base::TimeDelta time_idle,
                      Group* group,
                      const NetLogWithSource& net_log);
 
   // Adds |socket| to the list of idle sockets for |group|.
-  void AddIdleSocket(std::unique_ptr<StreamSocket> socket, Group* group);
+  // |connect_timing| is the connect timing of the connection establishment;
+  void AddIdleSocket(std::unique_ptr<StreamSocket> socket,
+                     Group* group,
+                     const LoadTimingInfo::ConnectTiming& connect_timing);
 
   // Iterates through |group_map_|, canceling all ConnectJobs and deleting
   // groups if they are no longer needed.
   void CancelAllConnectJobs();
 
   // Iterates through |group_map_|, posting |error| callbacks for all
   // requests, and then deleting groups if they are no longer needed.
   void CancelAllRequestsWithError(int error);
 
   // Returns true if we can't create any more sockets due to the total limit.
@@ skipping 199 matching lines @@
     helper_.RequestSockets(group_name, request, num_sockets);
   }
 
   void CancelRequest(const std::string& group_name,
                      ClientSocketHandle* handle) {
     return helper_.CancelRequest(group_name, handle);
   }
 
   void ReleaseSocket(const std::string& group_name,
                      std::unique_ptr<StreamSocket> socket,
-                     int id) {
-    return helper_.ReleaseSocket(group_name, std::move(socket), id);
+                     int id,
+                     const LoadTimingInfo::ConnectTiming& connect_timing) {
+    return helper_.ReleaseSocket(group_name, std::move(socket), id,
+                                 connect_timing);
   }
 
   void FlushWithError(int error) { helper_.FlushWithError(error); }
 
   bool IsStalled() const { return helper_.IsStalled(); }
 
   void CloseIdleSockets() { return helper_.CloseIdleSockets(); }
 
   int idle_socket_count() const { return helper_.idle_socket_count(); }
 
@@ skipping 81 matching lines @@
   };
 
   internal::ClientSocketPoolBaseHelper helper_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolBase);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_CLIENT_SOCKET_POOL_BASE_H_