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 27 matching lines...) Expand all Loading... |
38 // TODO(yutak): Differentiate WebSocket pool manager and allow more | 38 // TODO(yutak): Differentiate WebSocket pool manager and allow more |
39 // simultaneous connections for WebSockets. | 39 // simultaneous connections for WebSockets. |
40 return new net::ClientSocketPoolManagerImpl( | 40 return new net::ClientSocketPoolManagerImpl( |
41 params.net_log, params.client_socket_factory | 41 params.net_log, params.client_socket_factory |
42 ? params.client_socket_factory | 42 ? params.client_socket_factory |
43 : net::ClientSocketFactory::GetDefaultFactory(), | 43 : net::ClientSocketFactory::GetDefaultFactory(), |
44 params.host_resolver, params.cert_verifier, params.channel_id_service, | 44 params.host_resolver, params.cert_verifier, params.channel_id_service, |
45 params.transport_security_state, params.cert_transparency_verifier, | 45 params.transport_security_state, params.cert_transparency_verifier, |
46 params.cert_policy_enforcer, params.ssl_session_cache_shard, | 46 params.cert_policy_enforcer, params.ssl_session_cache_shard, |
47 params.ssl_config_service, params.enable_ssl_connect_job_waiting, | 47 params.ssl_config_service, params.enable_ssl_connect_job_waiting, |
48 pool_type); | 48 pool_type, params.ssl_socket_config_service); |
49 } | 49 } |
50 | 50 |
51 } // unnamed namespace | 51 } // unnamed namespace |
52 | 52 |
53 namespace net { | 53 namespace net { |
54 | 54 |
55 HttpNetworkSession::Params::Params() | 55 HttpNetworkSession::Params::Params() |
56 : client_socket_factory(NULL), | 56 : client_socket_factory(NULL), |
57 host_resolver(NULL), | 57 host_resolver(NULL), |
58 cert_verifier(NULL), | 58 cert_verifier(NULL), |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 case WEBSOCKET_SOCKET_POOL: | 311 case WEBSOCKET_SOCKET_POOL: |
312 return websocket_socket_pool_manager_.get(); | 312 return websocket_socket_pool_manager_.get(); |
313 default: | 313 default: |
314 NOTREACHED(); | 314 NOTREACHED(); |
315 break; | 315 break; |
316 } | 316 } |
317 return NULL; | 317 return NULL; |
318 } | 318 } |
319 | 319 |
320 } // namespace net | 320 } // namespace net |
OLD | NEW |