diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 23:13:09 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 23:13:09 +0000 |
| commit | 3598c6021c4a79bc954153c6f02140826229e254 (patch) | |
| tree | b04ac8b7cee717886e794bd7c6e034d4920d0ed0 /net/http/http_proxy_client_socket_pool.cc | |
| parent | be825e07f72cada135d8fca0130bb2beccc0374c (diff) | |
| download | chromium_src-3598c6021c4a79bc954153c6f02140826229e254.zip chromium_src-3598c6021c4a79bc954153c6f02140826229e254.tar.gz chromium_src-3598c6021c4a79bc954153c6f02140826229e254.tar.bz2 | |
Break reference cycle from HttpProxyClientSocket=>HttpNetworkSession=>...
Note that this undoes the fix for http://crbug.com/49387 which is now unnecessary without the cycle.
Some other miscellaneous cleanup is thrown in here.
BUG=55175
TEST=none
Review URL: http://codereview.chromium.org/3418018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_proxy_client_socket_pool.cc')
| -rw-r--r-- | net/http/http_proxy_client_socket_pool.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc index 487656b..047ee00 100644 --- a/net/http/http_proxy_client_socket_pool.cc +++ b/net/http/http_proxy_client_socket_pool.cc @@ -27,14 +27,16 @@ HttpProxySocketParams::HttpProxySocketParams( const GURL& request_url, const std::string& user_agent, HostPortPair endpoint, - scoped_refptr<HttpNetworkSession> session, + HttpAuthCache* http_auth_cache, + HttpAuthHandlerFactory* http_auth_handler_factory, bool tunnel) : tcp_params_(tcp_params), ssl_params_(ssl_params), request_url_(request_url), user_agent_(user_agent), endpoint_(endpoint), - session_(tunnel ? session : NULL), + http_auth_cache_(tunnel ? http_auth_cache : NULL), + http_auth_handler_factory_(tunnel ? http_auth_handler_factory : NULL), tunnel_(tunnel) { DCHECK((tcp_params == NULL && ssl_params != NULL) || (tcp_params != NULL && ssl_params == NULL)); @@ -211,7 +213,9 @@ int HttpProxyConnectJob::DoHttpProxyConnect() { params_->request_url(), params_->user_agent(), params_->endpoint(), - proxy_server, params_->session(), + proxy_server, + params_->http_auth_cache(), + params_->http_auth_handler_factory(), params_->tunnel(), using_spdy_)); int result = transport_socket_->Connect(&callback_); |