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

net/http/http_cache_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_cache_transaction.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_POSIX)
 #include <unistd.h>
@@ skipping 633 matching lines @@
   DCHECK(!network_trans_);
   before_proxy_headers_sent_callback_ = callback;
 }
 
 int HttpCache::Transaction::ResumeNetworkStart() {
   if (network_trans_)
     return network_trans_->ResumeNetworkStart();
   return ERR_UNEXPECTED;
 }
 
+void HttpCache::Transaction::GetConnectionAttempts(
+    ConnectionAttempts* out) const {
+  ConnectionAttempts new_connection_attempts;
+  if (network_trans_)
+    network_trans_->GetConnectionAttempts(&new_connection_attempts);
+
+  out->swap(new_connection_attempts);
+  out->insert(out->begin(), old_connection_attempts_.begin(),
+              old_connection_attempts_.end());
+}
+
 //-----------------------------------------------------------------------------
 
 void HttpCache::Transaction::DoCallback(int rv) {
   DCHECK(rv != ERR_IO_PENDING);
   DCHECK(!callback_.is_null());
 
   read_buf_ = NULL;  // Release the buffer before invoking the callback.
 
   // Since Run may result in Read being called, clear callback_ up front.
   CompletionCallback c = callback_;
@@ skipping 2173 matching lines @@
   }
 }
 
 void HttpCache::Transaction::ResetNetworkTransaction() {
   DCHECK(!old_network_trans_load_timing_);
   DCHECK(network_trans_);
   LoadTimingInfo load_timing;
   if (network_trans_->GetLoadTimingInfo(&load_timing))
     old_network_trans_load_timing_.reset(new LoadTimingInfo(load_timing));
   total_received_bytes_ += network_trans_->GetTotalReceivedBytes();
+  ConnectionAttempts attempts;
+  network_trans_->GetConnectionAttempts(&attempts);
+  for (const auto& attempt : attempts)
+    old_connection_attempts_.push_back(attempt);
   network_trans_.reset();
 }
 
 // Histogram data from the end of 2010 show the following distribution of
 // response headers:
 //
 //   Content-Length............... 87%
 //   Date......................... 98%
 //   Last-Modified................ 49%
 //   Etag......................... 19%
@@ skipping 107 matching lines @@
     default:
       NOTREACHED();
   }
 }
 
 void HttpCache::Transaction::OnIOComplete(int result) {
   DoLoop(result);
 }
 
 }  // namespace net