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

net/tools/quic/quic_simple_server_session.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A toy server specific QuicSession subclass.
 
 #ifndef NET_TOOLS_QUIC_QUIC_SIMPLE_SERVER_SESSION_H_
 #define NET_TOOLS_QUIC_QUIC_SIMPLE_SERVER_SESSION_H_
 
 #include <stdint.h>
@@ skipping 64 matching lines @@
   // And enqueue HEADERS block in those PUSH_PROMISED for sending push response
   // later.
   virtual void PromisePushResources(
       const std::string& request_url,
       const std::list<QuicHttpResponseCache::ServerPushInfo>& resources,
       QuicStreamId original_stream_id,
       const SpdyHeaderBlock& original_request_headers);
 
  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;
   // Override to return true for locally preserved server push stream.
   void HandleFrameOnNonexistentOutgoingStream(QuicStreamId stream_id) override;
   // Override to handle reseting locally preserved streams.
   void HandleRstOnValidNonexistentStream(
       const QuicRstStreamFrame& frame) override;
 
   // QuicServerSessionBaseMethod:
@@ skipping 49 matching lines @@
   std::deque<PromisedStreamInfo> promised_streams_;
 
   QuicHttpResponseCache* response_cache_;  // Not owned.
 
   DISALLOW_COPY_AND_ASSIGN(QuicSimpleServerSession);
 };
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SIMPLE_SERVER_SESSION_H_