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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 normal_socket_pool_manager_( | 109 normal_socket_pool_manager_( |
110 CreateSocketPoolManager(NORMAL_SOCKET_POOL, params)), | 110 CreateSocketPoolManager(NORMAL_SOCKET_POOL, params)), |
111 websocket_socket_pool_manager_( | 111 websocket_socket_pool_manager_( |
112 CreateSocketPoolManager(WEBSOCKET_SOCKET_POOL, params)), | 112 CreateSocketPoolManager(WEBSOCKET_SOCKET_POOL, params)), |
113 quic_stream_factory_(params.host_resolver, | 113 quic_stream_factory_(params.host_resolver, |
114 params.client_socket_factory ? | 114 params.client_socket_factory ? |
115 params.client_socket_factory : | 115 params.client_socket_factory : |
116 net::ClientSocketFactory::GetDefaultFactory(), | 116 net::ClientSocketFactory::GetDefaultFactory(), |
117 params.http_server_properties, | 117 params.http_server_properties, |
118 params.cert_verifier, | 118 params.cert_verifier, |
| 119 params.server_bound_cert_service, |
119 params.quic_crypto_client_stream_factory, | 120 params.quic_crypto_client_stream_factory, |
120 params.quic_random ? params.quic_random : | 121 params.quic_random ? params.quic_random : |
121 QuicRandom::GetInstance(), | 122 QuicRandom::GetInstance(), |
122 params.quic_clock ? params. quic_clock : | 123 params.quic_clock ? params. quic_clock : |
123 new QuicClock(), | 124 new QuicClock(), |
124 params.quic_max_packet_length, | 125 params.quic_max_packet_length, |
125 params.quic_user_agent_id, | 126 params.quic_user_agent_id, |
126 params.quic_supported_versions, | 127 params.quic_supported_versions, |
127 params.enable_quic_port_selection, | 128 params.enable_quic_port_selection, |
128 params.enable_quic_pacing, | 129 params.enable_quic_pacing, |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 case WEBSOCKET_SOCKET_POOL: | 298 case WEBSOCKET_SOCKET_POOL: |
298 return websocket_socket_pool_manager_.get(); | 299 return websocket_socket_pool_manager_.get(); |
299 default: | 300 default: |
300 NOTREACHED(); | 301 NOTREACHED(); |
301 break; | 302 break; |
302 } | 303 } |
303 return NULL; | 304 return NULL; |
304 } | 305 } |
305 | 306 |
306 } // namespace net | 307 } // namespace net |
OLD | NEW |