Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: net/http/http_network_session.cc

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cookies_list.js Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 23 matching lines...) Expand all
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.server_bound_cert_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 pool_type); 50 pool_type);
51 } 51 }
52 52
53 } // unnamed namespace 53 } // unnamed namespace
54 54
55 namespace net { 55 namespace net {
56 56
57 HttpNetworkSession::Params::Params() 57 HttpNetworkSession::Params::Params()
58 : client_socket_factory(NULL), 58 : client_socket_factory(NULL),
59 host_resolver(NULL), 59 host_resolver(NULL),
60 cert_verifier(NULL), 60 cert_verifier(NULL),
61 server_bound_cert_service(NULL), 61 channel_id_service(NULL),
62 transport_security_state(NULL), 62 transport_security_state(NULL),
63 cert_transparency_verifier(NULL), 63 cert_transparency_verifier(NULL),
64 proxy_service(NULL), 64 proxy_service(NULL),
65 ssl_config_service(NULL), 65 ssl_config_service(NULL),
66 http_auth_handler_factory(NULL), 66 http_auth_handler_factory(NULL),
67 network_delegate(NULL), 67 network_delegate(NULL),
68 net_log(NULL), 68 net_log(NULL),
69 host_mapping_rules(NULL), 69 host_mapping_rules(NULL),
70 ignore_certificate_errors(false), 70 ignore_certificate_errors(false),
71 testing_fixed_http_port(0), 71 testing_fixed_http_port(0),
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 normal_socket_pool_manager_( 110 normal_socket_pool_manager_(
111 CreateSocketPoolManager(NORMAL_SOCKET_POOL, params)), 111 CreateSocketPoolManager(NORMAL_SOCKET_POOL, params)),
112 websocket_socket_pool_manager_( 112 websocket_socket_pool_manager_(
113 CreateSocketPoolManager(WEBSOCKET_SOCKET_POOL, params)), 113 CreateSocketPoolManager(WEBSOCKET_SOCKET_POOL, params)),
114 quic_stream_factory_(params.host_resolver, 114 quic_stream_factory_(params.host_resolver,
115 params.client_socket_factory ? 115 params.client_socket_factory ?
116 params.client_socket_factory : 116 params.client_socket_factory :
117 net::ClientSocketFactory::GetDefaultFactory(), 117 net::ClientSocketFactory::GetDefaultFactory(),
118 params.http_server_properties, 118 params.http_server_properties,
119 params.cert_verifier, 119 params.cert_verifier,
120 params.server_bound_cert_service, 120 params.channel_id_service,
121 params.quic_crypto_client_stream_factory, 121 params.quic_crypto_client_stream_factory,
122 params.quic_random ? params.quic_random : 122 params.quic_random ? params.quic_random :
123 QuicRandom::GetInstance(), 123 QuicRandom::GetInstance(),
124 params.quic_clock ? params. quic_clock : 124 params.quic_clock ? params. quic_clock :
125 new QuicClock(), 125 new QuicClock(),
126 params.quic_max_packet_length, 126 params.quic_max_packet_length,
127 params.quic_user_agent_id, 127 params.quic_user_agent_id,
128 params.quic_supported_versions, 128 params.quic_supported_versions,
129 params.enable_quic_port_selection, 129 params.enable_quic_port_selection,
130 params.enable_quic_pacing, 130 params.enable_quic_pacing,
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 case WEBSOCKET_SOCKET_POOL: 302 case WEBSOCKET_SOCKET_POOL:
303 return websocket_socket_pool_manager_.get(); 303 return websocket_socket_pool_manager_.get();
304 default: 304 default:
305 NOTREACHED(); 305 NOTREACHED();
306 break; 306 break;
307 } 307 }
308 return NULL; 308 return NULL;
309 } 309 }
310 310
311 } // namespace net 311 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698