| Index: net/socket/client_socket_handle.h
|
| ===================================================================
|
| --- net/socket/client_socket_handle.h (revision 68026)
|
| +++ net/socket/client_socket_handle.h (working copy)
|
| @@ -17,7 +17,9 @@
|
| #include "net/base/net_errors.h"
|
| #include "net/base/net_log.h"
|
| #include "net/base/request_priority.h"
|
| +#include "net/http/http_proxy_tunnel_client_socket.h"
|
| #include "net/http/http_response_info.h"
|
| +#include "net/http/http_stream.h"
|
| #include "net/socket/client_socket.h"
|
| #include "net/socket/client_socket_pool.h"
|
|
|
| @@ -109,6 +111,10 @@
|
| void set_ssl_error_response_info(const HttpResponseInfo& ssl_error_state) {
|
| ssl_error_response_info_ = ssl_error_state;
|
| }
|
| + void set_pending_https_proxy_response_socket(
|
| + HttpProxyTunnelClientSocket* socket) {
|
| + pending_https_proxy_response_socket_.reset(socket);
|
| + }
|
| void set_pending_http_proxy_connection(ClientSocketHandle* connection) {
|
| pending_http_proxy_connection_.reset(connection);
|
| }
|
| @@ -124,6 +130,9 @@
|
| const HttpResponseInfo& ssl_error_response_info() const {
|
| return ssl_error_response_info_;
|
| }
|
| + HttpProxyTunnelClientSocket* release_pending_https_proxy_response_socket() {
|
| + return pending_https_proxy_response_socket_.release();
|
| + }
|
| ClientSocketHandle* release_pending_http_proxy_connection() {
|
| return pending_http_proxy_connection_.release();
|
| }
|
| @@ -172,6 +181,7 @@
|
| int pool_id_; // See ClientSocketPool::ReleaseSocket() for an explanation.
|
| bool is_ssl_error_;
|
| HttpResponseInfo ssl_error_response_info_;
|
| + scoped_ptr<HttpProxyTunnelClientSocket> pending_https_proxy_response_socket_;
|
| scoped_ptr<ClientSocketHandle> pending_http_proxy_connection_;
|
| base::TimeTicks init_time_;
|
| base::TimeDelta setup_time_;
|
|
|