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 b05dc1f0f2ceae52bbf0d6611412353a98ee7824..9dc04fa8bbd0e1712b707ed26a2eeba99e4713cb 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; |
| @@ -81,6 +83,17 @@ class NET_EXPORT_PRIVATE QuicStreamRequest { |
| const BoundNetLog& net_log, |
| const CompletionCallback& callback); |
| + // |cert_verify_flags| is bitwise OR'd of CertVerifier::VerifyFlags and it is |
| + // passed to CertVerifier::Verify. |
| + int Request(const HostPortPair& host_port_pair, |
| + PrivacyMode privacy_mode, |
| + int cert_verify_flags, |
| + base::StringPiece origin_host, |
| + base::StringPiece method, |
| + const BoundNetLog& net_log, |
| + const CompletionCallback& callback, |
| + bool for_bidirectional); |
|
Ryan Hamilton
2016/02/27 00:21:14
If we need a new argument, just add it to the exis
xunjieli
2016/02/29 15:21:37
Done.
|
| + |
| void OnRequestComplete(int rv); |
| // Helper method that calls |factory_|'s GetTimeDelayForWaitingJob(). It |
| @@ -89,7 +102,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 |
|
Ryan Hamilton
2016/02/27 00:21:14
oh man, I really really really don't like this #if
xunjieli
2016/02/29 15:21:38
Acknowledged. I agree it is pretty ugly. Do you ha
|
| + |
| + // Initializes |stream_| or |bidirectional_stream_job_| from |session|. |
| + void InitializeStreamFromSession(QuicChromiumClientSession* session); |
| const std::string& origin_host() const { return origin_host_; } |
| @@ -106,6 +124,11 @@ class NET_EXPORT_PRIVATE QuicStreamRequest { |
| CompletionCallback callback_; |
| scoped_ptr<QuicHttpStream> stream_; |
| + bool for_bidirectional_; |
| +#if BUILDFLAG(ENABLE_BIDIRECTIONAL_STREAM) |
| + scoped_ptr<BidirectionalStreamJob> bidirectional_stream_job_; |
| +#endif |
| + |
| DISALLOW_COPY_AND_ASSIGN(QuicStreamRequest); |
| }; |