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_);
 
+  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 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) {
+  if (result != ERR_HTTPS_PROXY_TUNNEL_RESPONSE)

[Randy Smith (Not in Mondays), 2015/04/10 21:15:03]

Willing to educate me about why a proxy tunnel response is special?  It looks
like you're intercepting it in one place than avoiding intercepting it in the
other (here); why is this code not equivalent to getting rid of the conditional
here and the full call in OnHttpsProxyTunnelResponse?

[Deprecated (see juliatuttle), 2015/04/14 19:14:45]

Yes: we reset stream_request_ in OnHttpsProxyTunnelResponse, so we have to grab
the connection attempts early and then avoid grabbing them again later (when
stream_request_ is NULL).

I can make this a comment if you like.

[Randy Smith (Not in Mondays), 2015/04/15 20:19:07]

Yes, please.  (If it were arcana about tunneling in the abstract, I wouldn't
request it, since I know I really don't grok proxies & tunnels & proxy tunnels,
but if it's because of an oddity of this code, that seems worth doing.)

+    CopyConnectionAttempts();
+
   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 778 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_);
+
+  // 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