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

net/spdy/spdy_proxy_client_socket.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SPDY_SPDY_PROXY_CLIENT_SOCKET_H_
 #define NET_SPDY_SPDY_PROXY_CLIENT_SOCKET_H_
 #pragma once
 
 #include <string>
 #include <list>
 
@@ skipping 28 matching lines @@
  public:
   // Create a socket on top of the |spdy_stream| by sending a SYN_STREAM
   // CONNECT frame for |endpoint|.  After the SYN_REPLY is received,
   // any data read/written to the socket will be transferred in data
   // frames.
   SpdyProxyClientSocket(SpdyStream* spdy_stream,
                         const std::string& user_agent,
                         const HostPortPair& endpoint,
                         const GURL& url,
                         const HostPortPair& proxy_server,
-                        HttpAuthController* auth_controller);
+                        HttpAuthCache* auth_cache,
+                        HttpAuthHandlerFactory* auth_handler_factory);
+
 
   // On destruction Disconnect() is called.
   virtual ~SpdyProxyClientSocket();
 
+  const scoped_refptr<HttpAuthController>& auth_controller() {
+    return auth_;
+  }
+
   // ProxyClientSocket methods:
   virtual const HttpResponseInfo* GetConnectResponseInfo() const OVERRIDE;
-  virtual int RestartWithAuth(const CompletionCallback& callback) OVERRIDE;
-  virtual const scoped_refptr<HttpAuthController>& GetAuthController() OVERRIDE;
 
   // In the event of a non-200 response to the CONNECT request, this
   // method may be called to return an HttpStream in order to read
   // the response body.
   virtual HttpStream* CreateConnectResponseStream() OVERRIDE;
 
   // StreamSocket implementation.
   virtual int Connect(const CompletionCallback& callback) OVERRIDE;
   virtual void Disconnect() OVERRIDE;
   virtual bool IsConnected() const OVERRIDE;
@@ skipping 94 matching lines @@
   base::WeakPtrFactory<SpdyProxyClientSocket> weak_factory_;
 
   const BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocket);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_PROXY_CLIENT_SOCKET_H_