| 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 19 matching lines...) Expand all Loading... |
| 30 #include "net/spdy/spdy_session_pool.h" | 30 #include "net/spdy/spdy_session_pool.h" |
| 31 | 31 |
| 32 namespace { | 32 namespace { |
| 33 | 33 |
| 34 net::ClientSocketPoolManager* CreateSocketPoolManager( | 34 net::ClientSocketPoolManager* CreateSocketPoolManager( |
| 35 net::HttpNetworkSession::SocketPoolType pool_type, | 35 net::HttpNetworkSession::SocketPoolType pool_type, |
| 36 const net::HttpNetworkSession::Params& params) { | 36 const net::HttpNetworkSession::Params& params) { |
| 37 // TODO(yutak): Differentiate WebSocket pool manager and allow more | 37 // TODO(yutak): Differentiate WebSocket pool manager and allow more |
| 38 // simultaneous connections for WebSockets. | 38 // simultaneous connections for WebSockets. |
| 39 return new net::ClientSocketPoolManagerImpl( | 39 return new net::ClientSocketPoolManagerImpl( |
| 40 params.net_log, | 40 params.net_log, params.client_socket_factory |
| 41 params.client_socket_factory | 41 ? params.client_socket_factory |
| 42 ? params.client_socket_factory | 42 : net::ClientSocketFactory::GetDefaultFactory(), |
| 43 : net::ClientSocketFactory::GetDefaultFactory(), | 43 params.host_resolver, params.cert_verifier, params.channel_id_service, |
| 44 params.host_resolver, | 44 params.transport_security_state, params.cert_transparency_verifier, |
| 45 params.cert_verifier, | 45 params.cert_policy_enforcer, params.ssl_session_cache_shard, |
| 46 params.channel_id_service, | 46 params.proxy_service, params.ssl_config_service, |
| 47 params.transport_security_state, | 47 params.enable_ssl_connect_job_waiting, params.proxy_delegate, pool_type); |
| 48 params.cert_transparency_verifier, | |
| 49 params.ssl_session_cache_shard, | |
| 50 params.proxy_service, | |
| 51 params.ssl_config_service, | |
| 52 params.enable_ssl_connect_job_waiting, | |
| 53 params.proxy_delegate, | |
| 54 pool_type); | |
| 55 } | 48 } |
| 56 | 49 |
| 57 } // unnamed namespace | 50 } // unnamed namespace |
| 58 | 51 |
| 59 namespace net { | 52 namespace net { |
| 60 | 53 |
| 61 HttpNetworkSession::Params::Params() | 54 HttpNetworkSession::Params::Params() |
| 62 : client_socket_factory(NULL), | 55 : client_socket_factory(NULL), |
| 63 host_resolver(NULL), | 56 host_resolver(NULL), |
| 64 cert_verifier(NULL), | 57 cert_verifier(NULL), |
| 58 cert_policy_enforcer(NULL), |
| 65 channel_id_service(NULL), | 59 channel_id_service(NULL), |
| 66 transport_security_state(NULL), | 60 transport_security_state(NULL), |
| 67 cert_transparency_verifier(NULL), | 61 cert_transparency_verifier(NULL), |
| 68 proxy_service(NULL), | 62 proxy_service(NULL), |
| 69 ssl_config_service(NULL), | 63 ssl_config_service(NULL), |
| 70 http_auth_handler_factory(NULL), | 64 http_auth_handler_factory(NULL), |
| 71 network_delegate(NULL), | 65 network_delegate(NULL), |
| 72 net_log(NULL), | 66 net_log(NULL), |
| 73 host_mapping_rules(NULL), | 67 host_mapping_rules(NULL), |
| 74 enable_ssl_connect_job_waiting(false), | 68 enable_ssl_connect_job_waiting(false), |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 case WEBSOCKET_SOCKET_POOL: | 307 case WEBSOCKET_SOCKET_POOL: |
| 314 return websocket_socket_pool_manager_.get(); | 308 return websocket_socket_pool_manager_.get(); |
| 315 default: | 309 default: |
| 316 NOTREACHED(); | 310 NOTREACHED(); |
| 317 break; | 311 break; |
| 318 } | 312 } |
| 319 return NULL; | 313 return NULL; |
| 320 } | 314 } |
| 321 | 315 |
| 322 } // namespace net | 316 } // namespace net |
| OLD | NEW |