| 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 a6a3603cafa27a1f20cf53e1c5ab7c8ca0c8739f..3c5fd1b42b26897b68532cde4c4f74ed89396b8a 100644
|
| --- a/net/http/http_stream_factory_impl_job.h
|
| +++ b/net/http/http_stream_factory_impl_job.h
|
| @@ -127,7 +127,9 @@ class HttpStreamFactoryImpl::Job {
|
| };
|
|
|
| void OnStreamReadyCallback();
|
| - void OnSpdySessionReadyCallback();
|
| + // This callback function is called when a new spdy session is created.
|
| + void OnNewSpdySessionReadyCallback();
|
| + void OnWebSocketStreamReadyCallback();
|
| void OnStreamFailedCallback(int result);
|
| void OnCertificateErrorCallback(int result, const SSLInfo& ssl_info);
|
| void OnNeedsProxyAuthCallback(const HttpResponseInfo& response_info,
|
| @@ -292,6 +294,7 @@ class HttpStreamFactoryImpl::Job {
|
| bool establishing_tunnel_;
|
|
|
| scoped_ptr<HttpStream> stream_;
|
| + scoped_ptr<WebSocketStreamBase> websocket_stream_;
|
|
|
| // True if we negotiated NPN.
|
| bool was_npn_negotiated_;
|
|
|