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

net/tools/quic/quic_simple_server_session.cc

 // 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.
 
 #include "net/tools/quic/quic_simple_server_session.h"
 
 #include <utility>
 
 #include "net/quic/core/proto/cached_network_parameters.pb.h"
 #include "net/quic/core/quic_connection.h"
@@ skipping 96 matching lines @@
     return nullptr;
   }
 
   QuicSimpleServerStream* stream = new QuicSimpleServerStream(
       GetNextOutgoingStreamId(), this, response_cache_);
   stream->SetPriority(priority);
   ActivateStream(QuicWrapUnique(stream));
   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);
   HandlePromisedPushRequests();
 }
 
 void QuicSimpleServerSession::HandleFrameOnNonexistentOutgoingStream(
     QuicStreamId stream_id) {
   // If this stream is a promised but not created stream (stream_id within the
   // range of next_outgoing_stream_id_ and highes_promised_stream_id_),
@@ skipping 48 matching lines @@
 void QuicSimpleServerSession::SendPushPromise(QuicStreamId original_stream_id,
                                               QuicStreamId promised_stream_id,
                                               SpdyHeaderBlock headers) {
   QUIC_DLOG(INFO) << "stream " << original_stream_id
                   << " send PUSH_PROMISE for promised stream "
                   << promised_stream_id;
   WritePushPromise(original_stream_id, promised_stream_id, std::move(headers));
 }
 
 void QuicSimpleServerSession::HandlePromisedPushRequests() {
-  while (!promised_streams_.empty() &&
-         (FLAGS_quic_reloadable_flag_quic_refactor_stream_creation
-              ? ShouldCreateOutgoingDynamicStream2()
-              : ShouldCreateOutgoingDynamicStream())) {
+  while (!promised_streams_.empty() && ShouldCreateOutgoingDynamicStream()) {
     PromisedStreamInfo& promised_info = promised_streams_.front();
     DCHECK_EQ(next_outgoing_stream_id(), promised_info.stream_id);
 
     if (promised_info.is_cancelled) {
       // This stream has been reset by client. Skip this stream id.
       promised_streams_.pop_front();
       GetNextOutgoingStreamId();
       return;
     }
 
     QuicSimpleServerStream* promised_stream =
         static_cast<QuicSimpleServerStream*>(
-            FLAGS_quic_reloadable_flag_quic_refactor_stream_creation
-                ? MaybeCreateOutgoingDynamicStream(promised_info.priority)
-                : CreateOutgoingDynamicStream(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();
 
     SpdyHeaderBlock request_headers(std::move(promised_info.request_headers));
 
     promised_streams_.pop_front();
     promised_stream->PushResponse(std::move(request_headers));
   }
 }
 
 }  // namespace net