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

net/http/http_network_transaction.cc

 // 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.
 
 #include "net/http/http_network_transaction.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 540 matching lines @@
   OnIOComplete(ERR_SSL_CLIENT_AUTH_CERT_NEEDED);
 }
 
 void HttpNetworkTransaction::OnHttpsProxyTunnelResponse(
     const HttpResponseInfo& response_info,
     const SSLConfig& used_ssl_config,
     const ProxyInfo& used_proxy_info,
     HttpStream* stream) {
   DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_);
 
+  CopyConnectionAttempts();
+
   headers_valid_ = true;
   response_ = response_info;
   server_ssl_config_ = used_ssl_config;
   proxy_info_ = used_proxy_info;
   if (stream_)
     total_received_bytes_ += stream_->GetTotalReceivedBytes();
   stream_.reset(stream);
   stream_request_.reset();  // we're done with the stream request
   OnIOComplete(ERR_HTTPS_PROXY_TUNNEL_RESPONSE);
 }
 
+const ClientSocketHandle::ConnectionAttempts&
+HttpNetworkTransaction::connection_attempts() const {
+  return connection_attempts_;
+}
+
 bool HttpNetworkTransaction::IsSecureRequest() const {
   return request_->url.SchemeIsSecure();
 }
 
 bool HttpNetworkTransaction::UsingHttpProxyWithoutTunnel() const {
   return (proxy_info_.is_http() || proxy_info_.is_https() ||
           proxy_info_.is_quic()) &&
          !(request_->url.SchemeIs("https") || request_->url.SchemeIsWSOrWSS());
 }
 
@@ skipping 160 matching lines @@
             server_ssl_config_,
             proxy_ssl_config_,
             this,
             net_log_));
   }
   DCHECK(stream_request_.get());
   return ERR_IO_PENDING;
 }
 
 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());
   } else if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) {
     result = HandleCertificateRequest(result);
   } else if (result == ERR_HTTPS_PROXY_TUNNEL_RESPONSE) {
     // Return OK and let the caller read the proxy's error page
     next_state_ = STATE_NONE;
     return OK;
   } else if (result == ERR_HTTP_1_1_REQUIRED ||
@@ skipping 771 matching lines @@
     default:
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #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