summaryrefslogtreecommitdiffstats
path: root/net/http/http_network_session.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 02:37:45 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 02:37:45 +0000
commit47aef530fe0221533b954264831eebaa792764b6 (patch)
treeee411146635568c9d084ab4f0e30a52cb0561388 /net/http/http_network_session.h
parent198d0468712f48b7d02a5366cfa03989061ed147 (diff)
downloadchromium_src-47aef530fe0221533b954264831eebaa792764b6.zip
chromium_src-47aef530fe0221533b954264831eebaa792764b6.tar.gz
chromium_src-47aef530fe0221533b954264831eebaa792764b6.tar.bz2
Reland my ClientSocketPool refactor.
Fixed a bug where we were double compensating for active_socket_count in CancelRequest and OnIOComplete. Added ClientSocketPoolTest_TwoRequestsCancelOne to catch this. Triggered a DCHECK in debug mode before I removed the extra code in OnIOComplete. BUG=http://www.crbug.com/13289 Review URL: http://codereview.chromium.org/118172 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_session.h')
-rw-r--r--net/http/http_network_session.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 7c4ac68..d96255a 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -12,13 +12,16 @@
namespace net {
+class ClientSocketFactory;
class ProxyService;
// This class holds session objects used by HttpNetworkTransaction objects.
class HttpNetworkSession : public base::RefCounted<HttpNetworkSession> {
public:
- explicit HttpNetworkSession(ProxyService* proxy_service)
- : connection_pool_(new ClientSocketPool(max_sockets_per_group_)),
+ HttpNetworkSession(ProxyService* proxy_service,
+ ClientSocketFactory* client_socket_factory)
+ : connection_pool_(new ClientSocketPool(
+ max_sockets_per_group_, client_socket_factory)),
proxy_service_(proxy_service) {
DCHECK(proxy_service);
}