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

net/tools/quic/quic_simple_server_session.h

Index: net/tools/quic/quic_simple_server_session.h
diff --git a/net/tools/quic/quic_simple_server_session.h b/net/tools/quic/quic_simple_server_session.h
index f9ff7da41fd1fd4ff2db30ba39bcf2ab5a6b2059..d1c4f854effd1888b9731d1daf53e1ab977e75f8 100644
--- a/net/tools/quic/quic_simple_server_session.h
+++ b/net/tools/quic/quic_simple_server_session.h
@@ -82,9 +82,14 @@ class QuicSimpleServerSession : public QuicServerSessionBase {
 
  protected:
   // QuicSession methods:
+  // TODO(ckrasic) - remove these two when
+  // FLAGS_quic_reloadable_flag_quic_refactor_stream_creation is
+  // deprecated.
   QuicSpdyStream* CreateIncomingDynamicStream(QuicStreamId id) override;
   QuicSimpleServerStream* CreateOutgoingDynamicStream(
       SpdyPriority priority) override;
+  std::unique_ptr<QuicStream> CreateStream(QuicStreamId id) override;
+
   // Closing an outgoing stream can reduce open outgoing stream count, try
   // to handle queued promised streams right now.
   void CloseStreamInner(QuicStreamId stream_id, bool locally_reset) override;