Add a "LoadLog*" parameter to transactions, hostresolver, clientsocketpool.

net/http/http_network_transaction.cc

 // Copyright (c) 2006-2009 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 "base/scoped_ptr.h"
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
 #include "base/string_util.h"
@@ skipping 143 matching lines @@
       response_body_length_(-1),  // -1 means unspecified.
       response_body_read_(0),
       read_buf_len_(0),
       next_state_(STATE_NONE) {
 #if defined(OS_WIN)
   // TODO(port): Port the SSLConfigService class to Linux and Mac OS X.
   session->ssl_config_service()->GetSSLConfig(&ssl_config_);
 #endif
 }
 
-int HttpNetworkTransaction::Start(const HttpRequestInfo* request_info,
+int HttpNetworkTransaction::Start(LoadLog* load_log,
+                                  const HttpRequestInfo* request_info,
                                   CompletionCallback* callback) {
   UpdateConnectionTypeHistograms(CONNECTION_ANY);
 
+  load_log_ = load_log;
   request_ = request_info;
   start_time_ = base::Time::Now();
 
   next_state_ = STATE_RESOLVE_PROXY;
   int rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING)
     user_callback_ = callback;
   return rv;
 }
 
@@ skipping 355 matching lines @@
   DCHECK(!pac_request_);
 
   next_state_ = STATE_RESOLVE_PROXY_COMPLETE;
 
   if (request_->load_flags & LOAD_BYPASS_PROXY) {
     proxy_info_.UseDirect();
     return OK;
   }
 
   return session_->proxy_service()->ResolveProxy(
-      request_->url, &proxy_info_, &io_callback_, &pac_request_);
+      load_log_, request_->url, &proxy_info_, &io_callback_, &pac_request_);
 }
 
 int HttpNetworkTransaction::DoResolveProxyComplete(int result) {
   next_state_ = STATE_INIT_CONNECTION;
 
   // Remove unsupported proxies from the list.
   proxy_info_.RemoveProxiesWithoutScheme(
       ProxyServer::SCHEME_DIRECT | ProxyServer::SCHEME_HTTP |
       ProxyServer::SCHEME_SOCKS4 | ProxyServer::SCHEME_SOCKS5);
 
@@ skipping 66 matching lines @@
   resolve_info.set_referrer(request_->referrer);
 
   // If the user is refreshing the page, bypass the host cache.
   if (request_->load_flags & LOAD_BYPASS_CACHE ||
       request_->load_flags & LOAD_DISABLE_CACHE) {
     resolve_info.set_allow_cached_response(false);
   }
 
   transport_socket_request_time_ = base::TimeTicks::Now();
 
-  int rv = connection_.Init(connection_group, resolve_info, request_->priority,
-                            &io_callback_);
+  int rv = connection_.Init(NULL, connection_group, resolve_info,
+                            request_->priority, &io_callback_);
   return rv;
 }
 
 int HttpNetworkTransaction::DoInitConnectionComplete(int result) {
   if (result < 0)
     return ReconsiderProxyAfterError(result);
 
   DCHECK(connection_.is_initialized());
 
   // Set the reused_socket_ flag to indicate that we are using a keep-alive
@@ skipping 895 matching lines @@
       break;
     default:
       return error;
   }
 
   if (request_->load_flags & LOAD_BYPASS_PROXY) {
     return error;
   }
 
   int rv = session_->proxy_service()->ReconsiderProxyAfterError(
-      request_->url, &proxy_info_, &io_callback_, &pac_request_);
+      load_log_, request_->url, &proxy_info_, &io_callback_, &pac_request_);
   if (rv == OK || rv == ERR_IO_PENDING) {
     // If the error was during connection setup, there is no socket to
     // disconnect.
     if (connection_.socket())
       connection_.socket()->Disconnect();
     connection_.Reset();
     DCHECK(!request_headers_bytes_sent_);
     next_state_ = STATE_RESOLVE_PROXY_COMPLETE;
   } else {
     rv = error;
@@ skipping 267 matching lines @@
     host_and_port = proxy_info_.proxy_server().host_and_port();
   } else {
     DCHECK(target == HttpAuth::AUTH_SERVER);
     host_and_port = GetHostAndPort(request_->url);
   }
   auth_info->host_and_port = ASCIIToWide(host_and_port);
   response_.auth_challenge = auth_info;
 }
 
 }  // namespace net