Chromium Code Reviews| Index: net/quic/quic_stream_factory.h |
| diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h |
| index 919f9ea784f3a86fe6a7ecb8ee791141866dc51c..6052a1f3eac19058d2b31c3196eeb8ecf1b5df92 100644 |
| --- a/net/quic/quic_stream_factory.h |
| +++ b/net/quic/quic_stream_factory.h |
| @@ -25,6 +25,7 @@ |
| #include "net/cert/cert_database.h" |
| #include "net/http/http_server_properties.h" |
| #include "net/log/net_log.h" |
| +#include "net/net_features.h" |
| #include "net/proxy/proxy_server.h" |
| #include "net/quic/network_connection.h" |
| #include "net/quic/quic_chromium_client_session.h" |
| @@ -55,6 +56,7 @@ class QuicServerInfoFactory; |
| class QuicStreamFactory; |
| class SocketPerformanceWatcherFactory; |
| class TransportSecurityState; |
| +class BidirectionalStreamJob; |
| namespace test { |
| class QuicStreamFactoryPeer; |
| @@ -79,7 +81,8 @@ class NET_EXPORT_PRIVATE QuicStreamRequest { |
| const GURL& url, |
| base::StringPiece method, |
| const BoundNetLog& net_log, |
| - const CompletionCallback& callback); |
| + const CompletionCallback& callback, |
| + bool for_bidirectional); |
|
Ryan Hamilton
2016/03/03 04:14:58
Ditto about using the enum instead of the boolean.
xunjieli
2016/03/03 16:54:19
Done.
|
| void OnRequestComplete(int rv); |
| @@ -89,7 +92,12 @@ class NET_EXPORT_PRIVATE QuicStreamRequest { |
| scoped_ptr<QuicHttpStream> ReleaseStream(); |
| - void set_stream(scoped_ptr<QuicHttpStream> stream); |
| +#if BUILDFLAG(ENABLE_BIDIRECTIONAL_STREAM) |
| + scoped_ptr<BidirectionalStreamJob> ReleaseBidirectionalStreamJob(); |
| +#endif |
| + |
| + // Initializes |stream_| or |bidirectional_stream_job_| from |session|. |
| + void InitializeStreamFromSession(QuicChromiumClientSession* session); |
| const std::string& origin_host() const { return origin_host_; } |
| @@ -107,6 +115,11 @@ class NET_EXPORT_PRIVATE QuicStreamRequest { |
| CompletionCallback callback_; |
| scoped_ptr<QuicHttpStream> stream_; |
| + bool for_bidirectional_; |
|
Ryan Hamilton
2016/03/03 04:14:58
Should this be inside this #ifdef?
xunjieli
2016/03/03 16:54:19
Done.
|
| +#if BUILDFLAG(ENABLE_BIDIRECTIONAL_STREAM) |
| + scoped_ptr<BidirectionalStreamJob> bidirectional_stream_job_; |
| +#endif |
| + |
| DISALLOW_COPY_AND_ASSIGN(QuicStreamRequest); |
| }; |