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

net/tools/quic/quic_simple_server_session.cc

Index: net/tools/quic/quic_simple_server_session.cc
diff --git a/net/tools/quic/quic_simple_server_session.cc b/net/tools/quic/quic_simple_server_session.cc
index 4f3ed4b473abf1dee2b82c2a15b1f1f4a76190e2..c4392c11c1ee33834fcd72fd6008374ac0e91921 100644
--- a/net/tools/quic/quic_simple_server_session.cc
+++ b/net/tools/quic/quic_simple_server_session.cc
@@ -114,6 +114,11 @@ QuicSimpleServerStream* QuicSimpleServerSession::CreateOutgoingDynamicStream(
   return stream;
 }
 
+std::unique_ptr<QuicStream> QuicSimpleServerSession::CreateStream(
+    QuicStreamId id) {
+  return QuicMakeUnique<QuicSimpleServerStream>(id, this, response_cache_);
+}
+
 void QuicSimpleServerSession::CloseStreamInner(QuicStreamId stream_id,
                                                bool locally_reset) {
   QuicSpdySession::CloseStreamInner(stream_id, locally_reset);
@@ -182,7 +187,10 @@ void QuicSimpleServerSession::SendPushPromise(QuicStreamId original_stream_id,
 }
 
 void QuicSimpleServerSession::HandlePromisedPushRequests() {
-  while (!promised_streams_.empty() && ShouldCreateOutgoingDynamicStream()) {
+  while (!promised_streams_.empty() &&
+         (FLAGS_quic_reloadable_flag_quic_refactor_stream_creation
+              ? ShouldCreateOutgoingDynamicStream2()
+              : ShouldCreateOutgoingDynamicStream())) {
     PromisedStreamInfo& promised_info = promised_streams_.front();
     DCHECK_EQ(next_outgoing_stream_id(), promised_info.stream_id);
 
@@ -195,7 +203,9 @@ void QuicSimpleServerSession::HandlePromisedPushRequests() {
 
     QuicSimpleServerStream* promised_stream =
         static_cast<QuicSimpleServerStream*>(
-            CreateOutgoingDynamicStream(promised_info.priority));
+            FLAGS_quic_reloadable_flag_quic_refactor_stream_creation
+                ? MaybeCreateOutgoingDynamicStream(promised_info.priority)
+                : CreateOutgoingDynamicStream(promised_info.priority));
     DCHECK_NE(promised_stream, nullptr);
     DCHECK_EQ(promised_info.stream_id, promised_stream->id());
     QUIC_DLOG(INFO) << "created server push stream " << promised_stream->id();