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 24 matching lines...) Expand all Loading... |
35 // simultaneous connections for WebSockets. | 35 // simultaneous connections for WebSockets. |
36 return new net::ClientSocketPoolManagerImpl( | 36 return new net::ClientSocketPoolManagerImpl( |
37 params.net_log, | 37 params.net_log, |
38 params.client_socket_factory ? | 38 params.client_socket_factory ? |
39 params.client_socket_factory : | 39 params.client_socket_factory : |
40 net::ClientSocketFactory::GetDefaultFactory(), | 40 net::ClientSocketFactory::GetDefaultFactory(), |
41 params.host_resolver, | 41 params.host_resolver, |
42 params.cert_verifier, | 42 params.cert_verifier, |
43 params.server_bound_cert_service, | 43 params.server_bound_cert_service, |
44 params.transport_security_state, | 44 params.transport_security_state, |
| 45 params.cert_transparency_verifier, |
45 params.ssl_session_cache_shard, | 46 params.ssl_session_cache_shard, |
46 params.proxy_service, | 47 params.proxy_service, |
47 params.ssl_config_service, | 48 params.ssl_config_service, |
48 pool_type); | 49 pool_type); |
49 } | 50 } |
50 | 51 |
51 } // unnamed namespace | 52 } // unnamed namespace |
52 | 53 |
53 namespace net { | 54 namespace net { |
54 | 55 |
55 HttpNetworkSession::Params::Params() | 56 HttpNetworkSession::Params::Params() |
56 : client_socket_factory(NULL), | 57 : client_socket_factory(NULL), |
57 host_resolver(NULL), | 58 host_resolver(NULL), |
58 cert_verifier(NULL), | 59 cert_verifier(NULL), |
59 server_bound_cert_service(NULL), | 60 server_bound_cert_service(NULL), |
60 transport_security_state(NULL), | 61 transport_security_state(NULL), |
| 62 cert_transparency_verifier(NULL), |
61 proxy_service(NULL), | 63 proxy_service(NULL), |
62 ssl_config_service(NULL), | 64 ssl_config_service(NULL), |
63 http_auth_handler_factory(NULL), | 65 http_auth_handler_factory(NULL), |
64 network_delegate(NULL), | 66 network_delegate(NULL), |
65 net_log(NULL), | 67 net_log(NULL), |
66 host_mapping_rules(NULL), | 68 host_mapping_rules(NULL), |
67 force_http_pipelining(false), | 69 force_http_pipelining(false), |
68 ignore_certificate_errors(false), | 70 ignore_certificate_errors(false), |
69 http_pipelining_enabled(false), | 71 http_pipelining_enabled(false), |
70 testing_fixed_http_port(0), | 72 testing_fixed_http_port(0), |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 case WEBSOCKET_SOCKET_POOL: | 222 case WEBSOCKET_SOCKET_POOL: |
221 return websocket_socket_pool_manager_.get(); | 223 return websocket_socket_pool_manager_.get(); |
222 default: | 224 default: |
223 NOTREACHED(); | 225 NOTREACHED(); |
224 break; | 226 break; |
225 } | 227 } |
226 return NULL; | 228 return NULL; |
227 } | 229 } |
228 | 230 |
229 } // namespace net | 231 } // namespace net |
OLD | NEW |