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

net/tools/quic/test_tools/quic_test_server.cc

 // Copyright (c) 2015 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/test_tools/quic_test_server.h"
 
 #include "net/quic/platform/api/quic_ptr_util.h"
 #include "net/tools/quic/quic_epoll_alarm_factory.h"
 #include "net/tools/quic/quic_epoll_connection_helper.h"
 #include "net/tools/quic/quic_simple_crypto_server_stream_helper.h"
@@ skipping 20 matching lines @@
                                 connection,
                                 visitor,
                                 helper,
                                 crypto_config,
                                 compressed_certs_cache,
                                 response_cache),
         stream_factory_(stream_factory),
         crypto_stream_factory_(crypto_stream_factory) {}
 
   QuicSpdyStream* CreateIncomingDynamicStream(QuicStreamId id) override {
+    DCHECK(!FLAGS_quic_reloadable_flag_quic_refactor_stream_creation);
     if (!ShouldCreateIncomingDynamicStream(id)) {
       return nullptr;
     }
     if (stream_factory_) {
       QuicSpdyStream* stream =
           stream_factory_->CreateStream(id, this, response_cache());
       ActivateStream(QuicWrapUnique(stream));
       return stream;
     }
     return QuicSimpleServerSession::CreateIncomingDynamicStream(id);
   }
 
+  std::unique_ptr<QuicStream> CreateStream(QuicStreamId id) override {
+    if (stream_factory_) {
+      return QuicWrapUnique<QuicSpdyStream>(
+          stream_factory_->CreateStream(id, this, response_cache()));
+    }
+    return QuicSimpleServerSession::CreateStream(id);
+  }
+
   QuicCryptoServerStreamBase* CreateQuicCryptoServerStream(
       const QuicCryptoServerConfig* crypto_config,
       QuicCompressedCertsCache* compressed_certs_cache) override {
     if (crypto_stream_factory_) {
       return crypto_stream_factory_->CreateCryptoStream(crypto_config, this);
     }
     return QuicSimpleServerSession::CreateQuicCryptoServerStream(
         crypto_config, compressed_certs_cache);
   }
 
@@ skipping 139 matching lines @@
                               response_cache) {}
 
 void ImmediateGoAwaySession::OnStreamFrame(const QuicStreamFrame& frame) {
   SendGoAway(QUIC_PEER_GOING_AWAY, "");
   QuicSimpleServerSession::OnStreamFrame(frame);
 }
 
 }  // namespace test
 
 }  // namespace net