Revert 118950 - Allow chrome to handle 407 auth challenges to CONNECT requests

net/http/http_proxy_client_socket_pool.h

Index: net/http/http_proxy_client_socket_pool.h
===================================================================
--- net/http/http_proxy_client_socket_pool.h	(revision 120367)
+++ net/http/http_proxy_client_socket_pool.h	(working copy)
@@ -26,7 +26,6 @@
 
 class HostResolver;
 class HttpAuthCache;
-class HttpAuthController;
 class HttpAuthHandlerFactory;
 class SSLClientSocketPool;
 class SSLSocketParams;
@@ -35,17 +34,6 @@
 class TransportClientSocketPool;
 class TransportSocketParams;
 
-// Called when a 407 Proxy Authentication Required response is received
-// from an HTTP or HTTPS proxy when attempting to establish a CONNECT tunnel
-// to an HTTPS server.  Information about the challenge can be found in
-// the HttpResponse info.  Credentials should be added to the
-// HttpAuthController, and the CompletionCallback should be invoked
-// with the status.
-typedef base::Callback<void (const HttpResponseInfo&,
-                             HttpAuthController*,
-                             CompletionCallback)>
-    TunnelAuthCallback;
-
 // HttpProxySocketParams only needs the socket params for one of the proxy
 // types.  The other param must be NULL.  When using an HTTP Proxy,
 // |transport_params| must be set.  When using an HTTPS Proxy, |ssl_params|
@@ -62,8 +50,7 @@
       HttpAuthCache* http_auth_cache,
       HttpAuthHandlerFactory* http_auth_handler_factory,
       SpdySessionPool* spdy_session_pool,
-      bool tunnel,
-      TunnelAuthCallback auth_needed_callback);
+      bool tunnel);
 
   const scoped_refptr<TransportSocketParams>& transport_params() const {
     return transport_params_;
@@ -84,7 +71,6 @@
   const HostResolver::RequestInfo& destination() const;
   bool tunnel() const { return tunnel_; }
   bool ignore_limits() const { return ignore_limits_; }
-  TunnelAuthCallback auth_needed_callback() { return auth_needed_callback_; }
 
  private:
   friend class base::RefCounted<HttpProxySocketParams>;
@@ -100,7 +86,6 @@
   HttpAuthHandlerFactory* const http_auth_handler_factory_;
   const bool tunnel_;
   bool ignore_limits_;
-  TunnelAuthCallback auth_needed_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpProxySocketParams);
 };
@@ -135,8 +120,6 @@
     STATE_SPDY_PROXY_CREATE_STREAM,
     STATE_SPDY_PROXY_CREATE_STREAM_COMPLETE,
     STATE_SPDY_PROXY_CONNECT_COMPLETE,
-    STATE_RESTART_WITH_AUTH,
-    STATE_RESTART_WITH_AUTH_COMPLETE,
     STATE_NONE,
   };
 
@@ -158,11 +141,6 @@
   int DoSpdyProxyCreateStream();
   int DoSpdyProxyCreateStreamComplete(int result);
 
-  int DoRestartWithAuth();
-  int DoRestartWithAuthComplete(int result);
-
-  void HandleProxyAuthChallenge();
-
   // Begins the tcp connection and the optional Http proxy tunnel.  If the
   // request is not immediately servicable (likely), the request will return
   // ERR_IO_PENDING. An OK return from this function or the callback means
@@ -189,11 +167,6 @@
 
   scoped_refptr<SpdyStream> spdy_stream_;
 
-  // AuthController to be used for *all* requests when setting up this tunnel.
-  scoped_refptr<HttpAuthController> auth_;
-
-  base::WeakPtrFactory<HttpProxyConnectJob> ptr_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob);
 };