Plumb connection attempts from (non-proxy) ConnectJobs to HttpNetworkTransaction.

net/http/http_network_transaction.cc

Index: net/http/http_network_transaction.cc
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 5ce7572496466d181cf48ea802549ee8eb70e2b7..34366c5d3f6affd98cd436beade47245d587012c 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -558,6 +558,8 @@ void HttpNetworkTransaction::OnHttpsProxyTunnelResponse(
     HttpStream* stream) {
   DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_);
 
+  CopyConnectionAttempts();
+
   headers_valid_ = true;
   response_ = response_info;
   server_ssl_config_ = used_ssl_config;
@@ -569,6 +571,11 @@ void HttpNetworkTransaction::OnHttpsProxyTunnelResponse(
   OnIOComplete(ERR_HTTPS_PROXY_TUNNEL_RESPONSE);
 }
 
+const ClientSocketHandle::ConnectionAttempts&
+HttpNetworkTransaction::connection_attempts() const {
+  return connection_attempts_;
+}
+
 bool HttpNetworkTransaction::IsSecureRequest() const {
   return request_->url.SchemeIsSecure();
 }
@@ -749,6 +756,8 @@ int HttpNetworkTransaction::DoCreateStream() {
 }
 
 int HttpNetworkTransaction::DoCreateStreamComplete(int result) {
+  CopyConnectionAttempts();

[Ryan Hamilton, 2015/03/17 03:22:28]

Is it clear that these are the only places this method should be called?

[Deprecated (see juliatuttle), 2015/03/23 17:45:35]

It was clear to me when I wrote it; I looked for places that HNT reset
stream_request_ to find places it was "consumed".

+
   if (result == OK) {
     next_state_ = STATE_INIT_STREAM;
     DCHECK(stream_.get());
@@ -1540,4 +1549,11 @@ std::string HttpNetworkTransaction::DescribeState(State state) {
 
 #undef STATE_CASE
 
+void HttpNetworkTransaction::CopyConnectionAttempts() {
+  DCHECK(stream_request_);
+
+  for (const auto& attempt : stream_request_->connection_attempts())
+    connection_attempts_.push_back(attempt);

[Ryan Hamilton, 2015/03/17 03:22:28]

Could you simply do connection_attempts_ =
stream_request_->connection_attempts(); ?

[Deprecated (see juliatuttle), 2015/03/23 17:45:35]

Can we not restart the request with auth data? I want to make sure we capture
any errors in both the pre- and post-auth request at the URLRequest layer, once
I get there.

[Ryan Hamilton, 2015/03/24 19:20:19]

Oh, are you explicitly attempting to append and not assign?? I see. In that
case, I recommend adding a comment.

+}
+
 }  // namespace net