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

net/http/http_stream_factory_impl_job.h

 // Copyright (c) 2012 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_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_config_service.h"
 #include "net/http/http_auth.h"
 #include "net/http/http_auth_controller.h"
-#include "net/http/http_proxy_client_socket_pool.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_stream_factory_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/ssl_client_socket.h"
 
 namespace net {
 
 class ClientSocketHandle;
 class HttpAuthController;
@@ skipping 13 matching lines @@
   ~Job();
 
   // Start initiates the process of creating a new HttpStream. |request| will be
   // notified upon completion if the Job has not been Orphan()'d.
   void Start(Request* request);
 
   // Preconnect will attempt to request |num_streams| sockets from the
   // appropriate ClientSocketPool.
   int Preconnect(int num_streams);
 
-  int RestartTunnelWithProxyAuth();
-
+  int RestartTunnelWithProxyAuth(const AuthCredentials& credentials);
   LoadState GetLoadState() const;
 
   // Marks this Job as the "alternate" job, from Alternate-Protocol. Tracks the
   // original url so we can mark the Alternate-Protocol as broken if
   // we fail to connect.
   void MarkAsAlternate(const GURL& original_url);
 
   // Tells |this| to wait for |job| to resume it.
   void WaitFor(Job* job);
 
@@ skipping 56 matching lines @@
     STATE_DONE,
     STATE_NONE
   };
 
   void OnStreamReadyCallback();
   void OnSpdySessionReadyCallback();
   void OnStreamFailedCallback(int result);
   void OnCertificateErrorCallback(int result, const SSLInfo& ssl_info);
   void OnNeedsProxyAuthCallback(const HttpResponseInfo& response_info,
                                 HttpAuthController* auth_controller);
-  void OnNeedsProxyTunnelAuthCallback(const HttpResponseInfo& response_info,
-                                      HttpAuthController* auth_controller,
-                                      CompletionCallback callback);
   void OnNeedsClientAuthCallback(SSLCertRequestInfo* cert_info);
   void OnHttpsProxyTunnelResponseCallback(const HttpResponseInfo& response_info,
                                           HttpStream* stream);
   void OnPreconnectsComplete();
 
   void OnIOComplete(int result);
   int RunLoop(int result);
   int DoLoop(int result);
   int StartInternal();
 
@@ skipping 10 matching lines @@
   int DoInitConnectionComplete(int result);
   int DoWaitingUserAction(int result);
   int DoCreateStream();
   int DoCreateStreamComplete(int result);
   int DoRestartTunnelAuth();
   int DoRestartTunnelAuthComplete(int result);
 
   // Returns to STATE_INIT_CONNECTION and resets some state.
   void ReturnToStateInitConnection(bool close_connection);
 
-  void DoRestartTunnelWithProxyAuth();
-
   // Set the motivation for this request onto the underlying socket.
   void SetSocketMotivation();
 
   bool IsHttpsProxyAndHttpUrl();
 
 // Sets several fields of ssl_config for the given origin_server based on the
 // proxy info and other factors.
   void InitSSLConfig(const HostPortPair& origin_server,
                      SSLConfig* ssl_config) const;
 
@@ skipping 82 matching lines @@
 
   // Force spdy only for SSL connections.
   bool force_spdy_over_ssl_;
 
   // The certificate error while using SPDY over SSL for insecure URLs.
   int spdy_certificate_error_;
 
   scoped_refptr<HttpAuthController>
       auth_controllers_[HttpAuth::AUTH_NUM_TARGETS];
 
-  // Invoked after a request for tunnel auth has been handled.
-  CompletionCallback tunnel_auth_handled_callback_;
-
   // True when the tunnel is in the process of being established - we can't
   // read from the socket until the tunnel is done.
   bool establishing_tunnel_;
 
   scoped_ptr<HttpStream> stream_;
 
   // True if we negotiated NPN.
   bool was_npn_negotiated_;
 
   // Protocol negotiated with the server.
@@ skipping 16 matching lines @@
   bool existing_available_pipeline_;
 
   base::WeakPtrFactory<Job> ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Job);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_