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 18 matching lines...) Expand all Loading... | |
29 | 29 |
30 namespace { | 30 namespace { |
31 | 31 |
32 net::ClientSocketPoolManager* CreateSocketPoolManager( | 32 net::ClientSocketPoolManager* CreateSocketPoolManager( |
33 net::HttpNetworkSession::SocketPoolType pool_type, | 33 net::HttpNetworkSession::SocketPoolType pool_type, |
34 const net::HttpNetworkSession::Params& params) { | 34 const net::HttpNetworkSession::Params& params) { |
35 // TODO(yutak): Differentiate WebSocket pool manager and allow more | 35 // TODO(yutak): Differentiate WebSocket pool manager and allow more |
36 // simultaneous connections for WebSockets. | 36 // simultaneous connections for WebSockets. |
37 return new net::ClientSocketPoolManagerImpl( | 37 return new net::ClientSocketPoolManagerImpl( |
38 params.net_log, | 38 params.net_log, |
39 params.client_socket_factory ? | 39 params.client_socket_factory |
40 params.client_socket_factory : | 40 ? params.client_socket_factory |
41 net::ClientSocketFactory::GetDefaultFactory(), | 41 : net::ClientSocketFactory::GetDefaultFactory(), |
42 params.host_resolver, | 42 params.host_resolver, |
43 params.cert_verifier, | 43 params.cert_verifier, |
44 params.channel_id_service, | 44 params.channel_id_service, |
45 params.transport_security_state, | 45 params.transport_security_state, |
46 params.cert_transparency_verifier, | 46 params.cert_transparency_verifier, |
47 params.ssl_session_cache_shard, | 47 params.ssl_session_cache_shard, |
48 params.proxy_service, | 48 params.proxy_service, |
49 params.ssl_config_service, | 49 params.ssl_config_service, |
50 params.enable_ssl_connect_job_waiting, | |
50 pool_type); | 51 pool_type); |
51 } | 52 } |
52 | 53 |
53 } // unnamed namespace | 54 } // unnamed namespace |
54 | 55 |
55 namespace net { | 56 namespace net { |
56 | 57 |
57 HttpNetworkSession::Params::Params() | 58 HttpNetworkSession::Params::Params() |
58 : client_socket_factory(NULL), | 59 : client_socket_factory(NULL), |
59 host_resolver(NULL), | 60 host_resolver(NULL), |
60 cert_verifier(NULL), | 61 cert_verifier(NULL), |
61 channel_id_service(NULL), | 62 channel_id_service(NULL), |
62 transport_security_state(NULL), | 63 transport_security_state(NULL), |
63 cert_transparency_verifier(NULL), | 64 cert_transparency_verifier(NULL), |
64 proxy_service(NULL), | 65 proxy_service(NULL), |
65 ssl_config_service(NULL), | 66 ssl_config_service(NULL), |
66 http_auth_handler_factory(NULL), | 67 http_auth_handler_factory(NULL), |
67 network_delegate(NULL), | 68 network_delegate(NULL), |
68 net_log(NULL), | 69 net_log(NULL), |
69 host_mapping_rules(NULL), | 70 host_mapping_rules(NULL), |
70 ignore_certificate_errors(false), | 71 ignore_certificate_errors(false), |
Lei Zhang
2014/08/05 02:37:45
You forgot to initialize |enable_ssl_connect_job_w
| |
71 testing_fixed_http_port(0), | 72 testing_fixed_http_port(0), |
72 testing_fixed_https_port(0), | 73 testing_fixed_https_port(0), |
73 force_spdy_single_domain(false), | 74 force_spdy_single_domain(false), |
74 enable_spdy_compression(true), | 75 enable_spdy_compression(true), |
75 enable_spdy_ping_based_connection_checking(true), | 76 enable_spdy_ping_based_connection_checking(true), |
76 spdy_default_protocol(kProtoUnknown), | 77 spdy_default_protocol(kProtoUnknown), |
77 spdy_stream_initial_recv_window_size(0), | 78 spdy_stream_initial_recv_window_size(0), |
78 spdy_initial_max_concurrent_streams(0), | 79 spdy_initial_max_concurrent_streams(0), |
79 spdy_max_concurrent_streams_limit(0), | 80 spdy_max_concurrent_streams_limit(0), |
80 time_func(&base::TimeTicks::Now), | 81 time_func(&base::TimeTicks::Now), |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
299 case WEBSOCKET_SOCKET_POOL: | 300 case WEBSOCKET_SOCKET_POOL: |
300 return websocket_socket_pool_manager_.get(); | 301 return websocket_socket_pool_manager_.get(); |
301 default: | 302 default: |
302 NOTREACHED(); | 303 NOTREACHED(); |
303 break; | 304 break; |
304 } | 305 } |
305 return NULL; | 306 return NULL; |
306 } | 307 } |
307 | 308 |
308 } // namespace net | 309 } // namespace net |
OLD | NEW |