Revert 54405 - Fix late binding induced mismatch of Socket and AuthController...

net/http/http_proxy_client_socket.h

Index: net/http/http_proxy_client_socket.h
===================================================================
--- net/http/http_proxy_client_socket.h	(revision 54614)
+++ net/http/http_proxy_client_socket.h	(working copy)
@@ -35,8 +35,7 @@
   // this socket will establish an Http tunnel.
   HttpProxyClientSocket(ClientSocketHandle* transport_socket,
                         const GURL& request_url, const HostPortPair& endpoint,
-                        const HostPortPair& proxy_server,
-                        const scoped_refptr<HttpNetworkSession>& session,
+                        const scoped_refptr<HttpAuthController>& auth,
                         bool tunnel);
 
   // On destruction Disconnect() is called.
@@ -47,14 +46,14 @@
   // RestartWithAuth.
   int RestartWithAuth(CompletionCallback* callback);
 
+  // Indicates if RestartWithAuth needs to be called. i.e. if Connect
+  // returned PROXY_AUTH_REQUESTED.  Only valid after Connect has been called.
+  bool NeedsRestartWithAuth() const;
+
   const HttpResponseInfo* GetResponseInfo() const {
-    return response_.headers ? &response_ : NULL;
+      return response_.headers ? &response_ : NULL;
   }
 
-  const scoped_refptr<HttpAuthController>& auth_controller() {
-    return auth_;
-  }
-
   // ClientSocket methods:
 
   // Authenticates to the Http Proxy and then passes data freely.
@@ -86,8 +85,6 @@
     STATE_RESOLVE_CANONICAL_NAME_COMPLETE,
     STATE_DRAIN_BODY,
     STATE_DRAIN_BODY_COMPLETE,
-    STATE_TCP_RESTART,
-    STATE_TCP_RESTART_COMPLETE,
     STATE_DONE,
   };
 
@@ -115,8 +112,6 @@
   int DoReadHeadersComplete(int result);
   int DoDrainBody();
   int DoDrainBodyComplete(int result);
-  int DoTCPRestart();
-  int DoTCPRestartComplete(int result);
 
   CompletionCallbackImpl<HttpProxyClientSocket> io_callback_;
   State next_state_;