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

Side by Side Diff: net/socket/client_socket_pool_manager_impl.h

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved tests back to ssl_client_socket_unittest.cc, fixed various other issues. Created 6 years, 4 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
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 #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 5 #ifndef NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
6 #define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 6 #define NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 ClientSocketPoolManagerImpl(NetLog* net_log, 60 ClientSocketPoolManagerImpl(NetLog* net_log,
61 ClientSocketFactory* socket_factory, 61 ClientSocketFactory* socket_factory,
62 HostResolver* host_resolver, 62 HostResolver* host_resolver,
63 CertVerifier* cert_verifier, 63 CertVerifier* cert_verifier,
64 ChannelIDService* channel_id_service, 64 ChannelIDService* channel_id_service,
65 TransportSecurityState* transport_security_state, 65 TransportSecurityState* transport_security_state,
66 CTVerifier* cert_transparency_verifier, 66 CTVerifier* cert_transparency_verifier,
67 const std::string& ssl_session_cache_shard, 67 const std::string& ssl_session_cache_shard,
68 ProxyService* proxy_service, 68 ProxyService* proxy_service,
69 SSLConfigService* ssl_config_service, 69 SSLConfigService* ssl_config_service,
70 bool enable_ssl_connect_job_waiting,
70 HttpNetworkSession::SocketPoolType pool_type); 71 HttpNetworkSession::SocketPoolType pool_type);
71 virtual ~ClientSocketPoolManagerImpl(); 72 virtual ~ClientSocketPoolManagerImpl();
72 73
73 virtual void FlushSocketPoolsWithError(int error) OVERRIDE; 74 virtual void FlushSocketPoolsWithError(int error) OVERRIDE;
74 virtual void CloseIdleSockets() OVERRIDE; 75 virtual void CloseIdleSockets() OVERRIDE;
75 76
76 virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE; 77 virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE;
77 78
78 virtual SSLClientSocketPool* GetSSLSocketPool() OVERRIDE; 79 virtual SSLClientSocketPool* GetSSLSocketPool() OVERRIDE;
79 80
(...skipping 27 matching lines...) Expand all
107 NetLog* const net_log_; 108 NetLog* const net_log_;
108 ClientSocketFactory* const socket_factory_; 109 ClientSocketFactory* const socket_factory_;
109 HostResolver* const host_resolver_; 110 HostResolver* const host_resolver_;
110 CertVerifier* const cert_verifier_; 111 CertVerifier* const cert_verifier_;
111 ChannelIDService* const channel_id_service_; 112 ChannelIDService* const channel_id_service_;
112 TransportSecurityState* const transport_security_state_; 113 TransportSecurityState* const transport_security_state_;
113 CTVerifier* const cert_transparency_verifier_; 114 CTVerifier* const cert_transparency_verifier_;
114 const std::string ssl_session_cache_shard_; 115 const std::string ssl_session_cache_shard_;
115 ProxyService* const proxy_service_; 116 ProxyService* const proxy_service_;
116 const scoped_refptr<SSLConfigService> ssl_config_service_; 117 const scoped_refptr<SSLConfigService> ssl_config_service_;
118 bool enable_ssl_connect_job_waiting_;
117 const HttpNetworkSession::SocketPoolType pool_type_; 119 const HttpNetworkSession::SocketPoolType pool_type_;
118 120
119 // Note: this ordering is important. 121 // Note: this ordering is important.
120 122
121 ClientSocketPoolHistograms transport_pool_histograms_; 123 ClientSocketPoolHistograms transport_pool_histograms_;
122 scoped_ptr<TransportClientSocketPool> transport_socket_pool_; 124 scoped_ptr<TransportClientSocketPool> transport_socket_pool_;
123 125
124 ClientSocketPoolHistograms ssl_pool_histograms_; 126 ClientSocketPoolHistograms ssl_pool_histograms_;
125 scoped_ptr<SSLClientSocketPool> ssl_socket_pool_; 127 scoped_ptr<SSLClientSocketPool> ssl_socket_pool_;
126 128
(...skipping 17 matching lines...) Expand all
144 146
145 ClientSocketPoolHistograms ssl_socket_pool_for_proxies_histograms_; 147 ClientSocketPoolHistograms ssl_socket_pool_for_proxies_histograms_;
146 SSLSocketPoolMap ssl_socket_pools_for_proxies_; 148 SSLSocketPoolMap ssl_socket_pools_for_proxies_;
147 149
148 DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl); 150 DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl);
149 }; 151 };
150 152
151 } // namespace net 153 } // namespace net
152 154
153 #endif // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 155 #endif // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698