Index: net/http/http_stream_factory_impl_job.h |
=================================================================== |
--- net/http/http_stream_factory_impl_job.h (revision 117986) |
+++ net/http/http_stream_factory_impl_job.h (working copy) |
@@ -13,6 +13,7 @@ |
#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" |
@@ -47,6 +48,8 @@ |
int Preconnect(int num_streams); |
int RestartTunnelWithProxyAuth(const AuthCredentials& credentials); |
+ void ReallyRestartTunnelWithProxyAuth(); |
vandebo (ex-Chrome)
2012/01/19 20:12:49
nit: These are usually named DoFoo
Ryan Hamilton
2012/01/19 23:11:19
Done. Though I thought DoFoo was typically reserv
vandebo (ex-Chrome)
2012/01/20 20:49:29
In the network code, the DoLoop methods all start
|
+ |
LoadState GetLoadState() const; |
// Marks this Job as the "alternate" job, from Alternate-Protocol. Tracks the |
@@ -123,6 +126,9 @@ |
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); |
@@ -253,6 +259,9 @@ |
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_; |