| 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 25 matching lines...) Expand all  Loading... | 
| 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.cert_transparency_verifier, | 
|  | 46       params.ssl_host_info_factory, | 
| 46       params.ssl_session_cache_shard, | 47       params.ssl_session_cache_shard, | 
| 47       params.proxy_service, | 48       params.proxy_service, | 
| 48       params.ssl_config_service, | 49       params.ssl_config_service, | 
| 49       pool_type); | 50       pool_type); | 
| 50 } | 51 } | 
| 51 | 52 | 
| 52 }  // unnamed namespace | 53 }  // unnamed namespace | 
| 53 | 54 | 
| 54 namespace net { | 55 namespace net { | 
| 55 | 56 | 
| 56 HttpNetworkSession::Params::Params() | 57 HttpNetworkSession::Params::Params() | 
| 57     : client_socket_factory(NULL), | 58     : client_socket_factory(NULL), | 
| 58       host_resolver(NULL), | 59       host_resolver(NULL), | 
| 59       cert_verifier(NULL), | 60       cert_verifier(NULL), | 
| 60       server_bound_cert_service(NULL), | 61       server_bound_cert_service(NULL), | 
| 61       transport_security_state(NULL), | 62       transport_security_state(NULL), | 
| 62       cert_transparency_verifier(NULL), | 63       cert_transparency_verifier(NULL), | 
| 63       proxy_service(NULL), | 64       proxy_service(NULL), | 
|  | 65       ssl_host_info_factory(NULL), | 
| 64       ssl_config_service(NULL), | 66       ssl_config_service(NULL), | 
| 65       http_auth_handler_factory(NULL), | 67       http_auth_handler_factory(NULL), | 
| 66       network_delegate(NULL), | 68       network_delegate(NULL), | 
| 67       net_log(NULL), | 69       net_log(NULL), | 
| 68       host_mapping_rules(NULL), | 70       host_mapping_rules(NULL), | 
| 69       force_http_pipelining(false), | 71       force_http_pipelining(false), | 
| 70       ignore_certificate_errors(false), | 72       ignore_certificate_errors(false), | 
| 71       http_pipelining_enabled(false), | 73       http_pipelining_enabled(false), | 
| 72       testing_fixed_http_port(0), | 74       testing_fixed_http_port(0), | 
| 73       testing_fixed_https_port(0), | 75       testing_fixed_https_port(0), | 
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 226     case WEBSOCKET_SOCKET_POOL: | 228     case WEBSOCKET_SOCKET_POOL: | 
| 227       return websocket_socket_pool_manager_.get(); | 229       return websocket_socket_pool_manager_.get(); | 
| 228     default: | 230     default: | 
| 229       NOTREACHED(); | 231       NOTREACHED(); | 
| 230       break; | 232       break; | 
| 231   } | 233   } | 
| 232   return NULL; | 234   return NULL; | 
| 233 } | 235 } | 
| 234 | 236 | 
| 235 }  //  namespace net | 237 }  //  namespace net | 
| OLD | NEW | 
|---|