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

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

Issue 9617039: Change Origin bound certs -> Domain bound certs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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/logging.h" 10 #include "base/logging.h"
(...skipping 15 matching lines...) Expand all
26 const net::HttpNetworkSession::Params& params) { 26 const net::HttpNetworkSession::Params& params) {
27 // TODO(yutak): Differentiate WebSocket pool manager and allow more 27 // TODO(yutak): Differentiate WebSocket pool manager and allow more
28 // simultaneous connections for WebSockets. 28 // simultaneous connections for WebSockets.
29 return new net::ClientSocketPoolManagerImpl( 29 return new net::ClientSocketPoolManagerImpl(
30 params.net_log, 30 params.net_log,
31 params.client_socket_factory ? 31 params.client_socket_factory ?
32 params.client_socket_factory : 32 params.client_socket_factory :
33 net::ClientSocketFactory::GetDefaultFactory(), 33 net::ClientSocketFactory::GetDefaultFactory(),
34 params.host_resolver, 34 params.host_resolver,
35 params.cert_verifier, 35 params.cert_verifier,
36 params.origin_bound_cert_service, 36 params.server_bound_cert_service,
37 params.transport_security_state, 37 params.transport_security_state,
38 params.ssl_host_info_factory, 38 params.ssl_host_info_factory,
39 params.ssl_session_cache_shard, 39 params.ssl_session_cache_shard,
40 params.proxy_service, 40 params.proxy_service,
41 params.ssl_config_service); 41 params.ssl_config_service);
42 } 42 }
43 43
44 } // unnamed namespace 44 } // unnamed namespace
45 45
46 namespace net { 46 namespace net {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 case NORMAL_SOCKET_POOL: 141 case NORMAL_SOCKET_POOL:
142 return normal_socket_pool_manager_.get(); 142 return normal_socket_pool_manager_.get();
143 case WEBSOCKET_SOCKET_POOL: 143 case WEBSOCKET_SOCKET_POOL:
144 return websocket_socket_pool_manager_.get(); 144 return websocket_socket_pool_manager_.get();
145 } 145 }
146 NOTREACHED(); 146 NOTREACHED();
147 return NULL; 147 return NULL;
148 } 148 }
149 149
150 } // namespace net 150 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_session.h ('k') | net/http/http_proxy_client_socket_pool_spdy21_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698