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..2aacae44a1f33fe9eb26ab708303553283f14c94 100644 |
--- a/net/quic/quic_stream_factory.h |
+++ b/net/quic/quic_stream_factory.h |
@@ -24,7 +24,9 @@ |
#include "net/base/network_change_notifier.h" |
#include "net/cert/cert_database.h" |
#include "net/http/http_server_properties.h" |
+#include "net/http/http_stream_factory.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 +57,7 @@ class QuicServerInfoFactory; |
class QuicStreamFactory; |
class SocketPerformanceWatcherFactory; |
class TransportSecurityState; |
+class BidirectionalStreamJob; |
namespace test { |
class QuicStreamFactoryPeer; |
@@ -89,7 +92,12 @@ class NET_EXPORT_PRIVATE QuicStreamRequest { |
scoped_ptr<QuicHttpStream> ReleaseStream(); |
Ryan Hamilton
2016/03/07 20:12:37
nit: Now that these don't simply release an existi
xunjieli
2016/03/08 15:39:32
Done.
|
- void set_stream(scoped_ptr<QuicHttpStream> stream); |
+#if BUILDFLAG(ENABLE_BIDIRECTIONAL_STREAM) |
+ scoped_ptr<BidirectionalStreamJob> ReleaseBidirectionalStreamJob(); |
+#endif |
+ |
+ // Sets |session_|. |
+ void SetSession(QuicChromiumClientSession* session); |
const std::string& origin_host() const { return origin_host_; } |
@@ -105,7 +113,7 @@ class NET_EXPORT_PRIVATE QuicStreamRequest { |
PrivacyMode privacy_mode_; |
BoundNetLog net_log_; |
CompletionCallback callback_; |
- scoped_ptr<QuicHttpStream> stream_; |
+ base::WeakPtr<QuicChromiumClientSession> session_; |
DISALLOW_COPY_AND_ASSIGN(QuicStreamRequest); |
}; |