Chromium Code Reviews| Index: net/http/http_stream_factory_impl.cc |
| =================================================================== |
| --- net/http/http_stream_factory_impl.cc (revision 118864) |
| +++ net/http/http_stream_factory_impl.cc (working copy) |
| @@ -72,13 +72,15 @@ |
| alternate_request_info.url = alternate_url; |
| alternate_job = |
| new Job(this, session_, alternate_request_info, server_ssl_config, |
| - proxy_ssl_config, net_log); |
| + proxy_ssl_config, net_log.net_log()); |
| request->AttachJob(alternate_job); |
| alternate_job->MarkAsAlternate(request_info.url); |
| } |
| + // We use |net_log|'s NetLog instead of |session_->net_log()| for unit |
|
eroman
2012/01/27 20:09:10
i don't understand the reference to unit-testing h
mmenke1
2012/01/27 20:12:49
Some of the unit tests pass in a CapturingNetLog w
|
| + // testing. |
| Job* job = new Job(this, session_, request_info, server_ssl_config, |
| - proxy_ssl_config, net_log); |
| + proxy_ssl_config, net_log.net_log()); |
| request->AttachJob(job); |
| if (alternate_job) { |
| job->WaitFor(alternate_job); |
| @@ -98,8 +100,7 @@ |
| int num_streams, |
| const HttpRequestInfo& request_info, |
| const SSLConfig& server_ssl_config, |
| - const SSLConfig& proxy_ssl_config, |
| - const BoundNetLog& net_log) { |
| + const SSLConfig& proxy_ssl_config) { |
| GURL alternate_url; |
| bool has_alternate_protocol = |
| GetAlternateProtocolRequestFor(request_info.url, &alternate_url); |
| @@ -108,11 +109,11 @@ |
| HttpRequestInfo alternate_request_info = request_info; |
| alternate_request_info.url = alternate_url; |
| job = new Job(this, session_, alternate_request_info, server_ssl_config, |
| - proxy_ssl_config, net_log); |
| + proxy_ssl_config, session_->net_log()); |
| job->MarkAsAlternate(request_info.url); |
| } else { |
| job = new Job(this, session_, request_info, server_ssl_config, |
| - proxy_ssl_config, net_log); |
| + proxy_ssl_config, session_->net_log()); |
| } |
| preconnect_job_set_.insert(job); |
| job->Preconnect(num_streams); |