Index: net/http/http_network_transaction.cc |
=================================================================== |
--- net/http/http_network_transaction.cc (revision 23124) |
+++ net/http/http_network_transaction.cc (working copy) |
@@ -161,10 +161,12 @@ |
#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(); |
@@ -540,7 +542,7 @@ |
} |
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) { |
@@ -627,8 +629,8 @@ |
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; |
} |
@@ -1544,7 +1546,7 @@ |
} |
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. |