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/atomic_sequence_num.h" | 9 #include "base/atomic_sequence_num.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 HttpNetworkSession::HttpNetworkSession(const Params& params) | 144 HttpNetworkSession::HttpNetworkSession(const Params& params) |
145 : net_log_(params.net_log), | 145 : net_log_(params.net_log), |
146 http_server_properties_(params.http_server_properties), | 146 http_server_properties_(params.http_server_properties), |
147 cert_verifier_(params.cert_verifier), | 147 cert_verifier_(params.cert_verifier), |
148 http_auth_handler_factory_(params.http_auth_handler_factory), | 148 http_auth_handler_factory_(params.http_auth_handler_factory), |
149 proxy_service_(params.proxy_service), | 149 proxy_service_(params.proxy_service), |
150 ssl_config_service_(params.ssl_config_service), | 150 ssl_config_service_(params.ssl_config_service), |
151 quic_stream_factory_( | 151 quic_stream_factory_( |
152 params.net_log, | 152 params.net_log, |
153 params.host_resolver, | 153 params.host_resolver, |
| 154 params.ssl_config_service, |
154 params.client_socket_factory | 155 params.client_socket_factory |
155 ? params.client_socket_factory | 156 ? params.client_socket_factory |
156 : ClientSocketFactory::GetDefaultFactory(), | 157 : ClientSocketFactory::GetDefaultFactory(), |
157 params.http_server_properties, | 158 params.http_server_properties, |
158 params.cert_verifier, | 159 params.cert_verifier, |
159 params.ct_policy_enforcer, | 160 params.ct_policy_enforcer, |
160 params.channel_id_service, | 161 params.channel_id_service, |
161 params.transport_security_state, | 162 params.transport_security_state, |
162 params.cert_transparency_verifier, | 163 params.cert_transparency_verifier, |
163 params.socket_performance_watcher_factory, | 164 params.socket_performance_watcher_factory, |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 case WEBSOCKET_SOCKET_POOL: | 407 case WEBSOCKET_SOCKET_POOL: |
407 return websocket_socket_pool_manager_.get(); | 408 return websocket_socket_pool_manager_.get(); |
408 default: | 409 default: |
409 NOTREACHED(); | 410 NOTREACHED(); |
410 break; | 411 break; |
411 } | 412 } |
412 return NULL; | 413 return NULL; |
413 } | 414 } |
414 | 415 |
415 } // namespace net | 416 } // namespace net |
OLD | NEW |