| 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 59066c2c96029066ac58bad66b712863886c8978..e0bf489f7850ebf9b2e9d84aa76185a937b3dfe9 100644
|
| --- a/net/http/http_stream_factory_impl.cc
|
| +++ b/net/http/http_stream_factory_impl.cc
|
| @@ -103,7 +103,7 @@ HttpStreamRequest* HttpStreamFactoryImpl::RequestStream(
|
| const SSLConfig& server_ssl_config,
|
| const SSLConfig& proxy_ssl_config,
|
| HttpStreamRequest::Delegate* delegate,
|
| - const BoundNetLog& net_log) {
|
| + const NetLogWithSource& net_log) {
|
| DCHECK(!for_websockets_);
|
| return RequestStreamInternal(request_info, priority, server_ssl_config,
|
| proxy_ssl_config, delegate, nullptr,
|
| @@ -117,7 +117,7 @@ HttpStreamRequest* HttpStreamFactoryImpl::RequestWebSocketHandshakeStream(
|
| const SSLConfig& proxy_ssl_config,
|
| HttpStreamRequest::Delegate* delegate,
|
| WebSocketHandshakeStreamBase::CreateHelper* create_helper,
|
| - const BoundNetLog& net_log) {
|
| + const NetLogWithSource& net_log) {
|
| DCHECK(for_websockets_);
|
| DCHECK(create_helper);
|
| return RequestStreamInternal(request_info, priority, server_ssl_config,
|
| @@ -131,7 +131,7 @@ HttpStreamRequest* HttpStreamFactoryImpl::RequestBidirectionalStreamImpl(
|
| const SSLConfig& server_ssl_config,
|
| const SSLConfig& proxy_ssl_config,
|
| HttpStreamRequest::Delegate* delegate,
|
| - const BoundNetLog& net_log) {
|
| + const NetLogWithSource& net_log) {
|
| DCHECK(!for_websockets_);
|
| DCHECK(request_info.url.SchemeIs(url::kHttpsScheme));
|
|
|
| @@ -149,7 +149,7 @@ HttpStreamRequest* HttpStreamFactoryImpl::RequestStreamInternal(
|
| WebSocketHandshakeStreamBase::CreateHelper*
|
| websocket_handshake_stream_create_helper,
|
| HttpStreamRequest::StreamType stream_type,
|
| - const BoundNetLog& net_log) {
|
| + const NetLogWithSource& net_log) {
|
| JobController* job_controller =
|
| new JobController(this, delegate, session_, job_factory_.get());
|
| job_controller_set_.insert(base::WrapUnique(job_controller));
|
| @@ -192,7 +192,7 @@ void HttpStreamFactoryImpl::OnNewSpdySessionReady(
|
| bool was_alpn_negotiated,
|
| NextProto negotiated_protocol,
|
| bool using_spdy,
|
| - const BoundNetLog& net_log) {
|
| + const NetLogWithSource& net_log) {
|
| while (true) {
|
| if (!spdy_session)
|
| break;
|
|
|