| Index: net/http/http_stream_factory_impl_job.h
|
| diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h
|
| index 6e7d47bf97eb0674df3101985025c1994198fde2..38eb6ae0e37dd522769d8fd53e6fc871508b5544 100644
|
| --- a/net/http/http_stream_factory_impl_job.h
|
| +++ b/net/http/http_stream_factory_impl_job.h
|
| @@ -126,7 +126,13 @@ class HttpStreamFactoryImpl::Job {
|
| };
|
|
|
| void OnStreamReadyCallback();
|
| - void OnSpdySessionReadyCallback();
|
| + void OnSocketReadyForWebSocketCallback();
|
| + // This callback function is called when a spdy session is available
|
| + // if for_websocket() is true.
|
| + void OnSpdySessionReadyForWebSocketCallback();
|
| + // This callback function is called when a new spdy session is created
|
| + // if for_websocket() is false.
|
| + void OnNewSpdySessionReadyCallback();
|
| void OnStreamFailedCallback(int result);
|
| void OnCertificateErrorCallback(int result, const SSLInfo& ssl_info);
|
| void OnNeedsProxyAuthCallback(const HttpResponseInfo& response_info,
|
| @@ -308,6 +314,9 @@ class HttpStreamFactoryImpl::Job {
|
| // Initialized when we have an existing SpdySession.
|
| scoped_refptr<SpdySession> existing_spdy_session_;
|
|
|
| + // A SPDY session to pass to OnSpdySessionReadyForWebSocketCallback
|
| + scoped_refptr<SpdySession> spdy_session_to_pass_;
|
| +
|
| // Only used if |new_spdy_session_| is non-NULL.
|
| bool spdy_session_direct_;
|
|
|
|
|