Index: net/http/http_proxy_client_socket_pool.h |
=================================================================== |
--- net/http/http_proxy_client_socket_pool.h (revision 62460) |
+++ net/http/http_proxy_client_socket_pool.h (working copy) |
@@ -25,6 +25,9 @@ |
class HttpAuthHandlerFactory; |
class SSLClientSocketPool; |
class SSLSocketParams; |
+class SpdySessionPool; |
+class SpdySettingsStorage; |
+class SpdyStream; |
class TCPClientSocketPool; |
class TCPSocketParams; |
@@ -41,6 +44,8 @@ |
HostPortPair endpoint, |
HttpAuthCache* http_auth_cache, |
HttpAuthHandlerFactory* http_auth_handler_factory, |
+ SpdySessionPool* spdy_session_pool, |
+ SpdySettingsStorage* spdy_settings, |
bool tunnel); |
const scoped_refptr<TCPSocketParams>& tcp_params() const { |
@@ -56,6 +61,12 @@ |
HttpAuthHandlerFactory* http_auth_handler_factory() const { |
return http_auth_handler_factory_; |
} |
+ SpdySessionPool* spdy_session_pool() { |
+ return spdy_session_pool_; |
+ } |
+ SpdySettingsStorage* spdy_settings() { |
+ return spdy_settings_; |
+ } |
const HostResolver::RequestInfo& destination() const; |
bool tunnel() const { return tunnel_; } |
@@ -65,6 +76,8 @@ |
const scoped_refptr<TCPSocketParams> tcp_params_; |
const scoped_refptr<SSLSocketParams> ssl_params_; |
+ SpdySessionPool* spdy_session_pool_; |
+ SpdySettingsStorage* spdy_settings_; |
const GURL request_url_; |
const std::string user_agent_; |
const HostPortPair endpoint_; |
@@ -100,6 +113,9 @@ |
STATE_SSL_CONNECT_COMPLETE, |
STATE_HTTP_PROXY_CONNECT, |
STATE_HTTP_PROXY_CONNECT_COMPLETE, |
+ STATE_SPDY_PROXY_CREATE_STREAM, |
+ STATE_SPDY_PROXY_CREATE_STREAM_COMPLETE, |
+ STATE_SPDY_PROXY_CONNECT_COMPLETE, |
STATE_NONE, |
}; |
@@ -127,6 +143,9 @@ |
int DoHttpProxyConnect(); |
int DoHttpProxyConnectComplete(int result); |
+ int DoSpdyProxyCreateStream(); |
+ int DoSpdyProxyCreateStreamComplete(int result); |
+ |
scoped_refptr<HttpProxySocketParams> params_; |
TCPClientSocketPool* const tcp_pool_; |
SSLClientSocketPool* const ssl_pool_; |
@@ -138,6 +157,8 @@ |
scoped_ptr<ClientSocket> transport_socket_; |
bool using_spdy_; |
+ scoped_refptr<SpdyStream> spdy_stream_; |
+ |
DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob); |
}; |