Index: net/http/http_stream_factory_impl.h |
diff --git a/net/http/http_stream_factory_impl.h b/net/http/http_stream_factory_impl.h |
index 8cb54bbc9204b652c9a1ef88589a5a560c8e6238..c11e7eac6283f6ced1f99206a5c03e4ccba2a0b7 100644 |
--- a/net/http/http_stream_factory_impl.h |
+++ b/net/http/http_stream_factory_impl.h |
@@ -39,6 +39,14 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : |
HttpStreamRequest::Delegate* delegate, |
const BoundNetLog& net_log) OVERRIDE; |
+ virtual HttpStreamRequest* RequestStreamForWebSocket( |
+ const HttpRequestInfo& info, |
+ RequestPriority priority, |
+ const SSLConfig& server_ssl_config, |
+ const SSLConfig& proxy_ssl_config, |
+ HttpStreamRequest::Delegate* delegate, |
+ const BoundNetLog& net_log) OVERRIDE; |
+ |
virtual void PreconnectStreams(int num_streams, |
const HttpRequestInfo& info, |
RequestPriority priority, |
@@ -61,6 +69,15 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : |
typedef std::map<HttpPipelinedHost::Key, |
RequestVector> HttpPipeliningRequestMap; |
+ HttpStreamRequest* RequestStreamInternal( |
+ const HttpRequestInfo& info, |
+ RequestPriority priority, |
+ const SSLConfig& server_ssl_config, |
+ const SSLConfig& proxy_ssl_config, |
+ HttpStreamRequest::Delegate* delegate, |
+ const BoundNetLog& net_log, |
+ bool for_websocket); |
+ |
PortAlternateProtocolPair GetAlternateProtocolRequestFor( |
const GURL& original_url, |
GURL* alternate_url) const; |
@@ -71,14 +88,14 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : |
// Called when a SpdySession is ready. It will find appropriate Requests and |
// fulfill them. |direct| indicates whether or not |spdy_session| uses a |
// proxy. |
- void OnSpdySessionReady(scoped_refptr<SpdySession> spdy_session, |
- bool direct, |
- const SSLConfig& used_ssl_config, |
- const ProxyInfo& used_proxy_info, |
- bool was_npn_negotiated, |
- NextProto protocol_negotiated, |
- bool using_spdy, |
- const BoundNetLog& net_log); |
+ void OnNewSpdySessionReady(scoped_refptr<SpdySession> spdy_session, |
+ bool direct, |
+ const SSLConfig& used_ssl_config, |
+ const ProxyInfo& used_proxy_info, |
+ bool was_npn_negotiated, |
+ NextProto protocol_negotiated, |
+ bool using_spdy, |
+ const BoundNetLog& net_log); |
// Called when the Job detects that the endpoint indicated by the |
// Alternate-Protocol does not work. Lets the factory update |