OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/http/http_network_session.h" | 5 #include "net/http/http_network_session.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/debug/stack_trace.h" | 10 #include "base/debug/stack_trace.h" |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 quic_stream_factory_( | 137 quic_stream_factory_( |
138 params.host_resolver, | 138 params.host_resolver, |
139 params.client_socket_factory | 139 params.client_socket_factory |
140 ? params.client_socket_factory | 140 ? params.client_socket_factory |
141 : ClientSocketFactory::GetDefaultFactory(), | 141 : ClientSocketFactory::GetDefaultFactory(), |
142 params.http_server_properties, | 142 params.http_server_properties, |
143 params.cert_verifier, | 143 params.cert_verifier, |
144 params.cert_policy_enforcer, | 144 params.cert_policy_enforcer, |
145 params.channel_id_service, | 145 params.channel_id_service, |
146 params.transport_security_state, | 146 params.transport_security_state, |
| 147 params.socket_performance_watcher_factory, |
147 params.quic_crypto_client_stream_factory, | 148 params.quic_crypto_client_stream_factory, |
148 params.quic_random ? params.quic_random : QuicRandom::GetInstance(), | 149 params.quic_random ? params.quic_random : QuicRandom::GetInstance(), |
149 params.quic_clock ? params.quic_clock : new QuicClock(), | 150 params.quic_clock ? params.quic_clock : new QuicClock(), |
150 params.quic_max_packet_length, | 151 params.quic_max_packet_length, |
151 params.quic_user_agent_id, | 152 params.quic_user_agent_id, |
152 params.quic_supported_versions, | 153 params.quic_supported_versions, |
153 params.enable_quic_port_selection, | 154 params.enable_quic_port_selection, |
154 params.quic_always_require_handshake_confirmation, | 155 params.quic_always_require_handshake_confirmation, |
155 params.quic_disable_connection_pooling, | 156 params.quic_disable_connection_pooling, |
156 params.quic_load_server_info_timeout_srtt_multiplier, | 157 params.quic_load_server_info_timeout_srtt_multiplier, |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 case WEBSOCKET_SOCKET_POOL: | 338 case WEBSOCKET_SOCKET_POOL: |
338 return websocket_socket_pool_manager_.get(); | 339 return websocket_socket_pool_manager_.get(); |
339 default: | 340 default: |
340 NOTREACHED(); | 341 NOTREACHED(); |
341 break; | 342 break; |
342 } | 343 } |
343 return NULL; | 344 return NULL; |
344 } | 345 } |
345 | 346 |
346 } // namespace net | 347 } // namespace net |
OLD | NEW |