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

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

Issue 8572041: Make ClientSocketPoolManager into an interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge. Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_HTTP_HTTP_NETWORK_SESSION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_ 6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 19 matching lines...) Expand all
30 class DnsCertProvenanceChecker; 30 class DnsCertProvenanceChecker;
31 class DnsRRResolver; 31 class DnsRRResolver;
32 class HostResolver; 32 class HostResolver;
33 class HttpAuthHandlerFactory; 33 class HttpAuthHandlerFactory;
34 class HttpNetworkSessionPeer; 34 class HttpNetworkSessionPeer;
35 class HttpProxyClientSocketPool; 35 class HttpProxyClientSocketPool;
36 class HttpResponseBodyDrainer; 36 class HttpResponseBodyDrainer;
37 class HttpServerProperties; 37 class HttpServerProperties;
38 class NetLog; 38 class NetLog;
39 class NetworkDelegate; 39 class NetworkDelegate;
40 class OriginBoundCertService;
40 class ProxyService; 41 class ProxyService;
42 class SOCKSClientSocketPool;
43 class SSLClientSocketPool;
41 class SSLConfigService; 44 class SSLConfigService;
42 class SSLHostInfoFactory; 45 class SSLHostInfoFactory;
46 class TransportClientSocketPool;
43 47
44 // This class holds session objects used by HttpNetworkTransaction objects. 48 // This class holds session objects used by HttpNetworkTransaction objects.
45 class NET_EXPORT HttpNetworkSession 49 class NET_EXPORT HttpNetworkSession
46 : public base::RefCounted<HttpNetworkSession>, 50 : public base::RefCounted<HttpNetworkSession>,
47 NON_EXPORTED_BASE(public base::NonThreadSafe) { 51 NON_EXPORTED_BASE(public base::NonThreadSafe) {
48 public: 52 public:
49 struct NET_EXPORT Params { 53 struct NET_EXPORT Params {
50 Params() 54 Params()
51 : client_socket_factory(NULL), 55 : client_socket_factory(NULL),
52 host_resolver(NULL), 56 host_resolver(NULL),
(...skipping 28 matching lines...) Expand all
81 85
82 HttpAuthCache* http_auth_cache() { return &http_auth_cache_; } 86 HttpAuthCache* http_auth_cache() { return &http_auth_cache_; }
83 SSLClientAuthCache* ssl_client_auth_cache() { 87 SSLClientAuthCache* ssl_client_auth_cache() {
84 return &ssl_client_auth_cache_; 88 return &ssl_client_auth_cache_;
85 } 89 }
86 90
87 void AddResponseDrainer(HttpResponseBodyDrainer* drainer); 91 void AddResponseDrainer(HttpResponseBodyDrainer* drainer);
88 92
89 void RemoveResponseDrainer(HttpResponseBodyDrainer* drainer); 93 void RemoveResponseDrainer(HttpResponseBodyDrainer* drainer);
90 94
91 TransportClientSocketPool* transport_socket_pool() { 95 TransportClientSocketPool* transport_socket_pool() {
mmenke 2011/11/16 16:12:03 nit: These functions should be renamed.
willchan no longer on Chromium 2011/11/16 17:26:06 Done.
92 return socket_pool_manager_.transport_socket_pool(); 96 return socket_pool_manager_->GetTransportSocketPool();
93 } 97 }
94 98
95 SSLClientSocketPool* ssl_socket_pool() { 99 SSLClientSocketPool* ssl_socket_pool() {
96 return socket_pool_manager_.ssl_socket_pool(); 100 return socket_pool_manager_->GetSSLSocketPool();
97 } 101 }
98 102
99 SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy( 103 SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy(
100 const HostPortPair& socks_proxy); 104 const HostPortPair& socks_proxy);
101 105
102 HttpProxyClientSocketPool* GetSocketPoolForHTTPProxy( 106 HttpProxyClientSocketPool* GetSocketPoolForHTTPProxy(
103 const HostPortPair& http_proxy); 107 const HostPortPair& http_proxy);
104 108
105 SSLClientSocketPool* GetSocketPoolForSSLWithProxy( 109 SSLClientSocketPool* GetSocketPoolForSSLWithProxy(
106 const HostPortPair& proxy_server); 110 const HostPortPair& proxy_server);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 HttpServerProperties* const http_server_properties_; 151 HttpServerProperties* const http_server_properties_;
148 CertVerifier* const cert_verifier_; 152 CertVerifier* const cert_verifier_;
149 HttpAuthHandlerFactory* const http_auth_handler_factory_; 153 HttpAuthHandlerFactory* const http_auth_handler_factory_;
150 154
151 // Not const since it's modified by HttpNetworkSessionPeer for testing. 155 // Not const since it's modified by HttpNetworkSessionPeer for testing.
152 ProxyService* proxy_service_; 156 ProxyService* proxy_service_;
153 const scoped_refptr<SSLConfigService> ssl_config_service_; 157 const scoped_refptr<SSLConfigService> ssl_config_service_;
154 158
155 HttpAuthCache http_auth_cache_; 159 HttpAuthCache http_auth_cache_;
156 SSLClientAuthCache ssl_client_auth_cache_; 160 SSLClientAuthCache ssl_client_auth_cache_;
157 ClientSocketPoolManager socket_pool_manager_; 161 scoped_ptr<ClientSocketPoolManager> socket_pool_manager_;
158 SpdySessionPool spdy_session_pool_; 162 SpdySessionPool spdy_session_pool_;
159 scoped_ptr<HttpStreamFactory> http_stream_factory_; 163 scoped_ptr<HttpStreamFactory> http_stream_factory_;
160 std::set<HttpResponseBodyDrainer*> response_drainers_; 164 std::set<HttpResponseBodyDrainer*> response_drainers_;
161 }; 165 };
162 166
163 } // namespace net 167 } // namespace net
164 168
165 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 169 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698