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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 : net::ClientSocketFactory::GetDefaultFactory(), | 43 : net::ClientSocketFactory::GetDefaultFactory(), |
44 params.host_resolver, | 44 params.host_resolver, |
45 params.cert_verifier, | 45 params.cert_verifier, |
46 params.channel_id_service, | 46 params.channel_id_service, |
47 params.transport_security_state, | 47 params.transport_security_state, |
48 params.cert_transparency_verifier, | 48 params.cert_transparency_verifier, |
49 params.ssl_session_cache_shard, | 49 params.ssl_session_cache_shard, |
50 params.proxy_service, | 50 params.proxy_service, |
51 params.ssl_config_service, | 51 params.ssl_config_service, |
52 params.enable_ssl_connect_job_waiting, | 52 params.enable_ssl_connect_job_waiting, |
| 53 params.before_proxy_tunnel_request_callback, |
53 pool_type); | 54 pool_type); |
54 } | 55 } |
55 | 56 |
56 } // unnamed namespace | 57 } // unnamed namespace |
57 | 58 |
58 namespace net { | 59 namespace net { |
59 | 60 |
60 HttpNetworkSession::Params::Params() | 61 HttpNetworkSession::Params::Params() |
61 : client_socket_factory(NULL), | 62 : client_socket_factory(NULL), |
62 host_resolver(NULL), | 63 host_resolver(NULL), |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
308 case WEBSOCKET_SOCKET_POOL: | 309 case WEBSOCKET_SOCKET_POOL: |
309 return websocket_socket_pool_manager_.get(); | 310 return websocket_socket_pool_manager_.get(); |
310 default: | 311 default: |
311 NOTREACHED(); | 312 NOTREACHED(); |
312 break; | 313 break; |
313 } | 314 } |
314 return NULL; | 315 return NULL; |
315 } | 316 } |
316 | 317 |
317 } // namespace net | 318 } // namespace net |
OLD | NEW |