Landing Recent QUIC changes until Sat Apr 29 00:22:04 2017 +0000

net/quic/core/quic_spdy_session.h

Index: net/quic/core/quic_spdy_session.h
diff --git a/net/quic/core/quic_spdy_session.h b/net/quic/core/quic_spdy_session.h
index 7ec0a01c1d2a95989b67b3edb8985310e22a070b..17115a76139b563ea1b74bccf9c5cf7eed9453d4 100644
--- a/net/quic/core/quic_spdy_session.h
+++ b/net/quic/core/quic_spdy_session.h
@@ -163,6 +163,9 @@ class QUIC_EXPORT_PRIVATE QuicSpdySession : public QuicSession {
       size_t set_max_uncompressed_header_bytes);
 
  protected:
+  // TODO(ckrasic) - remove these two when
+  // FLAGS_quic_reloadable_flag_quic_refactor_stream_creation is
+  // deprecated.
   // Override CreateIncomingDynamicStream() and CreateOutgoingDynamicStream()
   // with QuicSpdyStream return type to make sure that all data streams are
   // QuicSpdyStreams.
@@ -170,8 +173,16 @@ class QUIC_EXPORT_PRIVATE QuicSpdySession : public QuicSession {
   QuicSpdyStream* CreateOutgoingDynamicStream(SpdyPriority priority) override =
       0;
 
+  QuicSpdyStream* MaybeCreateIncomingDynamicStream(QuicStreamId id) override;
+  QuicSpdyStream* MaybeCreateOutgoingDynamicStream(
+      SpdyPriority priority) override;
+
   QuicSpdyStream* GetSpdyDataStream(const QuicStreamId stream_id);
 
+  // TODO(ckrasic) - remove these two when
+  // FLAGS_quic_reloadable_flag_quic_refactor_stream_creation is
+  // depreacted.
+
   // If an incoming stream can be created, return true.
   virtual bool ShouldCreateIncomingDynamicStream(QuicStreamId id) = 0;