Collect all ConnectionAttempts from both sockets in TransportConnectJob.

net/socket/stream_socket.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.
 
 #ifndef NET_SOCKET_STREAM_SOCKET_H_
 #define NET_SOCKET_STREAM_SOCKET_H_
 
 #include "net/log/net_log.h"
+#include "net/socket/connection_attempts.h"
 #include "net/socket/next_proto.h"
 #include "net/socket/socket.h"
 
 namespace net {
 
 class AddressList;
 class IPEndPoint;
 class SSLInfo;
 
 class NET_EXPORT_PRIVATE StreamSocket : public Socket {
  public:
-  ~StreamSocket() override {}
+  ~StreamSocket() override;
 
   // Called to establish a connection.  Returns OK if the connection could be
   // established synchronously.  Otherwise, ERR_IO_PENDING is returned and the
   // given callback will run asynchronously when the connection is established
   // or when an error occurs.  The result is some other error code if the
   // connection could not be established.
   //
   // The socket's Read and Write methods may not be called until Connect
   // succeeds.
   //
@@ skipping 57 matching lines @@
   virtual bool WasNpnNegotiated() const = 0;
 
   // Returns the protocol negotiated via NPN for this socket, or
   // kProtoUnknown will be returned if NPN is not applicable.
   virtual NextProto GetNegotiatedProtocol() const = 0;
 
   // Gets the SSL connection information of the socket.  Returns false if
   // SSL was not used by this socket.
   virtual bool GetSSLInfo(SSLInfo* ssl_info) = 0;
 
+  // Overwrites |out| with the connection attempts made in the process of
+  // connecting this socket.
+  virtual void GetConnectionAttempts(ConnectionAttempts* out) const = 0;
+
+  // Clears the connection attempts. (Called when the socket is being reused
+  // so the second and later owners don't see the attempts made to obtain it
+  // for the first owner.)

[Randy Smith (Not in Mondays), 2015/05/14 19:42:05]

I'd remove the parenthesis; it's about the consumer of the interface, which is
really none of the StreamSocket's business.  I'd probably say "Clears the
socket's list of connection attempts." but that's a nit&suggestion.

[Deprecated (see juliatuttle), 2015/05/14 20:02:35]

Done.

+  virtual void ClearConnectionAttempts() = 0;
+
+  // Adds |attempts| to the connection attempts. (Called when the socket is
+  // being returned from the connect job to include connection attempts made on
+  // the fallback [or main, if this was the fallback] socket.)

[Randy Smith (Not in Mondays), 2015/05/14 19:42:05]

Same comment about parenthetical, and similar but stronger comment about the
non-parenthetical; make it clear that the connection attempts being added to are
the internal set kept by the socket that will be returned by
GetConnectionAttempts().

[Deprecated (see juliatuttle), 2015/05/14 20:02:35]

Done.

+  virtual void AddConnectionAttempts(const ConnectionAttempts& attempts) = 0;
+
  protected:
   // The following class is only used to gather statistics about the history of
   // a socket.  It is only instantiated and used in basic sockets, such as
   // TCPClientSocket* instances.  Other classes that are derived from
   // StreamSocket should forward any potential settings to their underlying
   // transport sockets.
   class UseHistory {
    public:
     UseHistory();
     ~UseHistory();
@@ skipping 26 matching lines @@
     // identify the motivation.
     bool omnibox_speculation_;
     bool subresource_speculation_;
     DISALLOW_COPY_AND_ASSIGN(UseHistory);
   };
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_STREAM_SOCKET_H_