Collect all ConnectionAttempts from both sockets in TransportConnectJob.

net/socket/tcp_client_socket.h

Index: net/socket/tcp_client_socket.h
diff --git a/net/socket/tcp_client_socket.h b/net/socket/tcp_client_socket.h
index e1b3fa09433cbfa79b691fdd3da0893c6bf6c889..041369ddf8275b88075c379ff975703b13c35361 100644
--- a/net/socket/tcp_client_socket.h
+++ b/net/socket/tcp_client_socket.h
@@ -12,6 +12,7 @@
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/log/net_log.h"
+#include "net/socket/connection_attempts.h"
 #include "net/socket/stream_socket.h"
 #include "net/socket/tcp_socket.h"
 
@@ -69,6 +70,10 @@ class NET_EXPORT TCPClientSocket : public StreamSocket {
   virtual bool SetKeepAlive(bool enable, int delay);
   virtual bool SetNoDelay(bool no_delay);
 
+  void GetConnectionAttempts(ConnectionAttempts* out) const override;
+  void ClearConnectionAttempts() override;
+  void AddConnectionAttempts(const ConnectionAttempts& attempts) override;
+
  private:
   // State machine for connecting the socket.
   enum ConnectState {
@@ -116,6 +121,8 @@ class NET_EXPORT TCPClientSocket : public StreamSocket {
   // histograms.
   UseHistory use_history_;
 
+  ConnectionAttempts connection_attempts_;

[Randy Smith (Not in Mondays), 2015/05/12 20:11:09]

Note that this is used to store failed connection attempts (changing name is an
acceptable way to do that).

[Deprecated (see juliatuttle), 2015/05/13 18:22:29]

I will do this as part of the mass rename later, if that's okay?

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

Just stick a comment in right now, and then you can do what you want on the
rename.

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

Done.

+
   DISALLOW_COPY_AND_ASSIGN(TCPClientSocket);
 };