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

1 files changed, 9 insertions, 5 deletions

diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h
index c041c31..7dc8bdb 100644
--- a/net/http/http_proxy_client_socket_pool.h
+++ b/net/http/http_proxy_client_socket_pool.h
@@ -21,7 +21,8 @@
 namespace net {
 
 class HostResolver;
-class HttpNetworkSession;
+class HttpAuthCache;
+class HttpAuthHandlerFactory;
 class SSLClientSocketPool;
 class SSLSocketParams;
 class TCPClientSocketPool;
@@ -38,7 +39,8 @@ class HttpProxySocketParams : public base::RefCounted<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);
 
   const scoped_refptr<TCPSocketParams>& tcp_params() const {
@@ -50,8 +52,9 @@ class HttpProxySocketParams : public base::RefCounted<HttpProxySocketParams> {
   const GURL& request_url() const { return request_url_; }
   const std::string& user_agent() const { return user_agent_; }
   const HostPortPair& endpoint() const { return endpoint_; }
-  const scoped_refptr<HttpNetworkSession>& session() {
-    return session_;
+  HttpAuthCache* http_auth_cache() const { return http_auth_cache_; }
+  HttpAuthHandlerFactory* http_auth_handler_factory() const {
+    return http_auth_handler_factory_;
   }
   const HostResolver::RequestInfo& destination() const;
   bool tunnel() const { return tunnel_; }
@@ -65,7 +68,8 @@ class HttpProxySocketParams : public base::RefCounted<HttpProxySocketParams> {
   const GURL request_url_;
   const std::string user_agent_;
   const HostPortPair endpoint_;
-  const scoped_refptr<HttpNetworkSession> session_;
+  HttpAuthCache* const http_auth_cache_;
+  HttpAuthHandlerFactory* const http_auth_handler_factory_;
   const bool tunnel_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpProxySocketParams);