Chromium Code Reviews| Index: net/http/http_stream_factory_impl.cc |
| diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc |
| index 577a990853ae6ac0e4d83987152c46b7873ee019..bb433345a5921723191a6779ed0be38967e76682 100644 |
| --- a/net/http/http_stream_factory_impl.cc |
| +++ b/net/http/http_stream_factory_impl.cc |
| @@ -155,11 +155,12 @@ HttpStreamRequest* HttpStreamFactoryImpl::RequestStreamInternal( |
| HttpStreamRequest::StreamType stream_type, |
| const NetLogWithSource& net_log) { |
| JobController* job_controller = |
| - new JobController(this, delegate, session_, job_factory_.get()); |
| + new JobController(this, delegate, session_, job_factory_.get(), |
| + /*is_preconnect=*/false, net_log); |
| job_controller_set_.insert(base::WrapUnique(job_controller)); |
| Request* request = job_controller->Start( |
| - request_info, delegate, websocket_handshake_stream_create_helper, net_log, |
| + request_info, delegate, websocket_handshake_stream_create_helper, |
| stream_type, priority, server_ssl_config, proxy_ssl_config); |
| return request; |
| @@ -177,8 +178,10 @@ void HttpStreamFactoryImpl::PreconnectStreams( |
| DCHECK(!for_websockets_); |
| + NetLogWithSource dummy_netlog_with_source; |
|
mmenke
2017/01/25 19:32:17
Can just inline NetLogWithSource() in the line bel
xunjieli
2017/01/25 21:41:48
Done.
|
| JobController* job_controller = |
|
eroman
2017/01/25 19:55:26
side-comment: can you update this to be std::uniqu
xunjieli
2017/01/25 21:41:48
Done.
|
| - new JobController(this, nullptr, session_, job_factory_.get()); |
| + new JobController(this, nullptr, session_, job_factory_.get(), |
| + /*is_preconnect=*/true, dummy_netlog_with_source); |
| job_controller_set_.insert(base::WrapUnique(job_controller)); |
| job_controller->Preconnect(num_streams, request_info, server_ssl_config, |
| proxy_ssl_config); |
| @@ -195,8 +198,7 @@ void HttpStreamFactoryImpl::OnNewSpdySessionReady( |
| const ProxyInfo& used_proxy_info, |
| bool was_alpn_negotiated, |
| NextProto negotiated_protocol, |
| - bool using_spdy, |
| - const NetLogWithSource& net_log) { |
| + bool using_spdy) { |
| while (true) { |
| if (!spdy_session) |
| break; |