Collect all ConnectionAttempts from both sockets in TransportConnectJob.

net/socket/stream_socket.h

Index: net/socket/stream_socket.h
diff --git a/net/socket/stream_socket.h b/net/socket/stream_socket.h
index 30a199e2dc3c9f24e3ec07ac583209b38ef1c9e4..1bedb960970f1abaf39e465dbae84f486380f757 100644
--- a/net/socket/stream_socket.h
+++ b/net/socket/stream_socket.h
@@ -6,6 +6,7 @@
 #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"
 
@@ -17,7 +18,7 @@ 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
@@ -95,6 +96,20 @@ class NET_EXPORT_PRIVATE StreamSocket : public Socket {
   // 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. They come in no particular order.

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

I'd rather have the ordering comment next to the ConnectionAttempts typedef; it
applies to the type, right?

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

Done.

+  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.)
+  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.)
+  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