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, 4 insertions, 1 deletions

diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h
index 4702118..e80f697 100644
--- a/net/http/http_proxy_client_socket.h
+++ b/net/http/http_proxy_client_socket.h
@@ -25,6 +25,8 @@ namespace net {
 
 class AddressList;
 class ClientSocketHandle;
+class HttpAuthCache;
+class HttpAuthHandleFactory;
 class HttpStream;
 class IOBuffer;
 
@@ -38,7 +40,8 @@ class HttpProxyClientSocket : public ClientSocket {
                         const std::string& user_agent,
                         const HostPortPair& endpoint,
                         const HostPortPair& proxy_server,
-                        const scoped_refptr<HttpNetworkSession>& session,
+                        HttpAuthCache* http_auth_cache,
+                        HttpAuthHandlerFactory* http_auth_handler_factory,
                         bool tunnel,
                         bool using_spdy);