Index: net/http/http_proxy_client_socket.h |
diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h |
index 317b2201f1c769b0e4ea76397bbd40ea02bd6fc5..ef4f76c651d197069a2ceb03819694ecb24951ce 100644 |
--- a/net/http/http_proxy_client_socket.h |
+++ b/net/http/http_proxy_client_socket.h |
@@ -35,7 +35,8 @@ class HttpProxyClientSocket : public ClientSocket { |
// this socket will establish an Http tunnel. |
HttpProxyClientSocket(ClientSocketHandle* transport_socket, |
const GURL& request_url, const HostPortPair& endpoint, |
- const scoped_refptr<HttpAuthController>& auth, |
+ const HostPortPair& proxy_server, |
+ const scoped_refptr<HttpNetworkSession>& session, |
bool tunnel); |
// On destruction Disconnect() is called. |
@@ -46,12 +47,12 @@ class HttpProxyClientSocket : public ClientSocket { |
// 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: |
@@ -85,6 +86,8 @@ class HttpProxyClientSocket : public ClientSocket { |
STATE_RESOLVE_CANONICAL_NAME_COMPLETE, |
STATE_DRAIN_BODY, |
STATE_DRAIN_BODY_COMPLETE, |
+ STATE_TCP_RESTART, |
+ STATE_TCP_RESTART_COMPLETE, |
STATE_DONE, |
}; |
@@ -112,6 +115,8 @@ class HttpProxyClientSocket : public ClientSocket { |
int DoReadHeadersComplete(int result); |
int DoDrainBody(); |
int DoDrainBodyComplete(int result); |
+ int DoTCPRestart(); |
+ int DoTCPRestartComplete(int result); |
CompletionCallbackImpl<HttpProxyClientSocket> io_callback_; |
State next_state_; |