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 552 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_);
 
+  CopyConnectionAttemptsFromStreamRequest();
+
   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);
 }
 
+void HttpNetworkTransaction::GetConnectionAttempts(
+    ConnectionAttempts* out) const {
+  *out = 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 169 matching lines @@
   DCHECK(stream_request_.get());
   return ERR_IO_PENDING;
 }
 
 int HttpNetworkTransaction::DoCreateStreamComplete(int result) {
   // TODO(pkasting): Remove ScopedTracker below once crbug.com/424359 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "424359 HttpNetworkTransaction::DoCreateStreamComplete"));
 
+  // If |result| is ERR_HTTPS_PROXY_TUNNEL_RESPONSE, then
+  // DoCreateStreamComplete is being called from OnHttpsProxyTunnelResponse,
+  // which will have already copied connection attempts and reset the stream
+  // request, so don't try to do it again here.

[Randy Smith (Not in Mondays), 2015/04/23 19:04:09]

Also mention (here or in OnHttpsProxyTunnelResponse) that you *can't* do it here
because the stream_request_ is reset?  This doesn't really answer the question
"Why not just do it here?"

[Deprecated (see juliatuttle), 2015/04/23 21:04:16]

Done.

+  if (result != ERR_HTTPS_PROXY_TUNNEL_RESPONSE)
+    CopyConnectionAttemptsFromStreamRequest();
+
   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 868 matching lines @@
     default:
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #undef STATE_CASE
 
+void HttpNetworkTransaction::CopyConnectionAttemptsFromStreamRequest() {
+  DCHECK(stream_request_);
+
+  // Since the transaction can restart with auth credentials, it may create a
+  // stream more than once. Accumulate all of the connection attempts across
+  // those streams by appending them to the vector:
+  for (const auto& attempt : stream_request_->connection_attempts())
+    connection_attempts_.push_back(attempt);
+}
+
 }  // namespace net