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

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

Issue 135373002: Added SSLHostInfo. Storing of server host info to our standard disk cache. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed changes to SSL and non-net directories Created 6 years, 11 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 #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 14 matching lines...) Expand all
25 class ClientSocketPoolHistograms; 25 class ClientSocketPoolHistograms;
26 class CTVerifier; 26 class CTVerifier;
27 class HttpProxyClientSocketPool; 27 class HttpProxyClientSocketPool;
28 class HostResolver; 28 class HostResolver;
29 class NetLog; 29 class NetLog;
30 class ServerBoundCertService; 30 class ServerBoundCertService;
31 class ProxyService; 31 class ProxyService;
32 class SOCKSClientSocketPool; 32 class SOCKSClientSocketPool;
33 class SSLClientSocketPool; 33 class SSLClientSocketPool;
34 class SSLConfigService; 34 class SSLConfigService;
35 class SSLHostInfoFactory;
35 class TransportClientSocketPool; 36 class TransportClientSocketPool;
36 class TransportSecurityState; 37 class TransportSecurityState;
37 38
38 namespace internal { 39 namespace internal {
39 40
40 // A helper class for auto-deleting Values in the destructor. 41 // A helper class for auto-deleting Values in the destructor.
41 template <typename Key, typename Value> 42 template <typename Key, typename Value>
42 class OwnedPoolMap : public std::map<Key, Value> { 43 class OwnedPoolMap : public std::map<Key, Value> {
43 public: 44 public:
44 OwnedPoolMap() { 45 OwnedPoolMap() {
(...skipping 12 matching lines...) Expand all
57 public ClientSocketPoolManager, 58 public ClientSocketPoolManager,
58 public CertDatabase::Observer { 59 public CertDatabase::Observer {
59 public: 60 public:
60 ClientSocketPoolManagerImpl(NetLog* net_log, 61 ClientSocketPoolManagerImpl(NetLog* net_log,
61 ClientSocketFactory* socket_factory, 62 ClientSocketFactory* socket_factory,
62 HostResolver* host_resolver, 63 HostResolver* host_resolver,
63 CertVerifier* cert_verifier, 64 CertVerifier* cert_verifier,
64 ServerBoundCertService* server_bound_cert_service, 65 ServerBoundCertService* server_bound_cert_service,
65 TransportSecurityState* transport_security_state, 66 TransportSecurityState* transport_security_state,
66 CTVerifier* cert_transparency_verifier, 67 CTVerifier* cert_transparency_verifier,
68 SSLHostInfoFactory* ssl_host_info_factory,
wtc 2014/01/21 23:07:20 We should not need the changes to this file and to
ramant (doing other things) 2014/01/22 02:28:12 Done.
67 const std::string& ssl_session_cache_shard, 69 const std::string& ssl_session_cache_shard,
68 ProxyService* proxy_service, 70 ProxyService* proxy_service,
69 SSLConfigService* ssl_config_service, 71 SSLConfigService* ssl_config_service,
70 HttpNetworkSession::SocketPoolType pool_type); 72 HttpNetworkSession::SocketPoolType pool_type);
71 virtual ~ClientSocketPoolManagerImpl(); 73 virtual ~ClientSocketPoolManagerImpl();
72 74
73 virtual void FlushSocketPoolsWithError(int error) OVERRIDE; 75 virtual void FlushSocketPoolsWithError(int error) OVERRIDE;
74 virtual void CloseIdleSockets() OVERRIDE; 76 virtual void CloseIdleSockets() OVERRIDE;
75 77
76 virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE; 78 virtual TransportClientSocketPool* GetTransportSocketPool() OVERRIDE;
(...skipping 27 matching lines...) Expand all
104 typedef internal::OwnedPoolMap<HostPortPair, SSLClientSocketPool*> 106 typedef internal::OwnedPoolMap<HostPortPair, SSLClientSocketPool*>
105 SSLSocketPoolMap; 107 SSLSocketPoolMap;
106 108
107 NetLog* const net_log_; 109 NetLog* const net_log_;
108 ClientSocketFactory* const socket_factory_; 110 ClientSocketFactory* const socket_factory_;
109 HostResolver* const host_resolver_; 111 HostResolver* const host_resolver_;
110 CertVerifier* const cert_verifier_; 112 CertVerifier* const cert_verifier_;
111 ServerBoundCertService* const server_bound_cert_service_; 113 ServerBoundCertService* const server_bound_cert_service_;
112 TransportSecurityState* const transport_security_state_; 114 TransportSecurityState* const transport_security_state_;
113 CTVerifier* const cert_transparency_verifier_; 115 CTVerifier* const cert_transparency_verifier_;
116 SSLHostInfoFactory* const ssl_host_info_factory_;
114 const std::string ssl_session_cache_shard_; 117 const std::string ssl_session_cache_shard_;
115 ProxyService* const proxy_service_; 118 ProxyService* const proxy_service_;
116 const scoped_refptr<SSLConfigService> ssl_config_service_; 119 const scoped_refptr<SSLConfigService> ssl_config_service_;
117 const HttpNetworkSession::SocketPoolType pool_type_; 120 const HttpNetworkSession::SocketPoolType pool_type_;
118 121
119 // Note: this ordering is important. 122 // Note: this ordering is important.
120 123
121 ClientSocketPoolHistograms transport_pool_histograms_; 124 ClientSocketPoolHistograms transport_pool_histograms_;
122 scoped_ptr<TransportClientSocketPool> transport_socket_pool_; 125 scoped_ptr<TransportClientSocketPool> transport_socket_pool_;
123 126
(...skipping 20 matching lines...) Expand all
144 147
145 ClientSocketPoolHistograms ssl_socket_pool_for_proxies_histograms_; 148 ClientSocketPoolHistograms ssl_socket_pool_for_proxies_histograms_;
146 SSLSocketPoolMap ssl_socket_pools_for_proxies_; 149 SSLSocketPoolMap ssl_socket_pools_for_proxies_;
147 150
148 DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl); 151 DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl);
149 }; 152 };
150 153
151 } // namespace net 154 } // namespace net
152 155
153 #endif // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_ 156 #endif // NET_SOCKET_CLIENT_SOCKET_POOL_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698