diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 16:01:06 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 16:01:06 +0000 |
| commit | a512f598dca5030e9c02c497b36839cbdcd6e0cb (patch) | |
| tree | 0d1e24b54244557c52fe1bc1eac534316f378e8c /net/http | |
| parent | e4b553615a137a007b7c073d2ac2189fad00b6eb (diff) | |
| download | chromium_src-a512f598dca5030e9c02c497b36839cbdcd6e0cb.zip chromium_src-a512f598dca5030e9c02c497b36839cbdcd6e0cb.tar.gz chromium_src-a512f598dca5030e9c02c497b36839cbdcd6e0cb.tar.bz2 | |
Change ClientSocketHandle to take the pool as a parameter to Init() rather than the constructor. The purpose of this change is to allow ClientSocketHandle to be able to accept ClientSocketPools of different types, since we will want to pass a TCPClientSocketPool or an SSLClientSocketPool or whatever to it.
BUG=http://crbug.com/13289
Review URL: http://codereview.chromium.org/171003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_session.h | 2 | ||||
| -rw-r--r-- | net/http/http_network_transaction.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index 9e867d7..08e90ce 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h @@ -27,6 +27,8 @@ class HttpNetworkSession : public base::RefCounted<HttpNetworkSession> { SSLClientAuthCache* ssl_client_auth_cache() { return &ssl_client_auth_cache_; } + // TODO(willchan): Look at making this return a TCPClientSocketPool instead so + // we can get type safety information. ClientSocketPool* connection_pool() { return connection_pool_; } HostResolver* host_resolver() { return host_resolver_; } ProxyService* proxy_service() { return proxy_service_; } diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 19bf2e2..669ab35 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -139,7 +139,6 @@ HttpNetworkTransaction::HttpNetworkTransaction(HttpNetworkSession* session, request_(NULL), pac_request_(NULL), socket_factory_(csf), - connection_(session->connection_pool()), reused_socket_(false), using_ssl_(false), proxy_mode_(kDirectConnection), @@ -628,8 +627,8 @@ int HttpNetworkTransaction::DoInitConnection() { resolve_info.set_allow_cached_response(false); } - int rv = connection_.Init(connection_group, resolve_info, - request_->priority, &io_callback_, NULL); + int rv = connection_.Init(connection_group, resolve_info, request_->priority, + &io_callback_, session_->connection_pool(), NULL); return rv; } |