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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: net/http/http_network_session.h
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index c65b48083dd9ff14a1569f3b3bd2dd449c3de3d8..d15ed86054b549c55cf54028aed2f78ae539ddcc 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -37,9 +37,13 @@ class HttpResponseBodyDrainer;
class HttpServerProperties;
class NetLog;
class NetworkDelegate;
+class OriginBoundCertService;
class ProxyService;
+class SOCKSClientSocketPool;
+class SSLClientSocketPool;
class SSLConfigService;
class SSLHostInfoFactory;
+class TransportClientSocketPool;
// This class holds session objects used by HttpNetworkTransaction objects.
class NET_EXPORT HttpNetworkSession
@@ -89,11 +93,11 @@ class NET_EXPORT HttpNetworkSession
void RemoveResponseDrainer(HttpResponseBodyDrainer* drainer);
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.
- return socket_pool_manager_.transport_socket_pool();
+ return socket_pool_manager_->GetTransportSocketPool();
}
SSLClientSocketPool* ssl_socket_pool() {
- return socket_pool_manager_.ssl_socket_pool();
+ return socket_pool_manager_->GetSSLSocketPool();
}
SOCKSClientSocketPool* GetSocketPoolForSOCKSProxy(
@@ -154,7 +158,7 @@ class NET_EXPORT HttpNetworkSession
HttpAuthCache http_auth_cache_;
SSLClientAuthCache ssl_client_auth_cache_;
- ClientSocketPoolManager socket_pool_manager_;
+ scoped_ptr<ClientSocketPoolManager> socket_pool_manager_;
SpdySessionPool spdy_session_pool_;
scoped_ptr<HttpStreamFactory> http_stream_factory_;
std::set<HttpResponseBodyDrainer*> response_drainers_;

Powered by Google App Engine
This is Rietveld 408576698