QUIC - refactor stream creation. Guarded by --quic_reloadable_flag_quic_refactor_stream_creation.

net/quic/core/quic_server_session_base_test.cc

Index: net/quic/core/quic_server_session_base_test.cc
diff --git a/net/quic/core/quic_server_session_base_test.cc b/net/quic/core/quic_server_session_base_test.cc
index 77eec16c0f5f18310c584d480ef35dc7187c513b..596d2678333066be7247de6b1617ef5ab86398df 100644
--- a/net/quic/core/quic_server_session_base_test.cc
+++ b/net/quic/core/quic_server_session_base_test.cc
@@ -80,6 +80,8 @@ class TestServerSession : public QuicServerSessionBase {
   ~TestServerSession() override { delete connection(); };
 
  protected:
+  // TODO(ckrasic) - for two below, remove when
+  // quic_reloadable_flag_quic_refactor_stream_creation is deprecated.
   QuicSpdyStream* CreateIncomingDynamicStream(QuicStreamId id) override {
     if (!ShouldCreateIncomingDynamicStream(id)) {
       return nullptr;
@@ -102,6 +104,10 @@ class TestServerSession : public QuicServerSessionBase {
     return stream;
   }
 
+  std::unique_ptr<QuicStream> CreateStream(QuicStreamId id) override {
+    return QuicMakeUnique<QuicSimpleServerStream>(id, this, response_cache_);
+  }
+
   QuicCryptoServerStreamBase* CreateQuicCryptoServerStream(
       const QuicCryptoServerConfig* crypto_config,
       QuicCompressedCertsCache* compressed_certs_cache) override {
@@ -375,9 +381,15 @@ TEST_P(QuicServerSessionBaseTest, GetEvenIncomingError) {
 TEST_P(QuicServerSessionBaseTest, GetStreamDisconnected) {
   // Don't create new streams if the connection is disconnected.
   QuicConnectionPeer::TearDownLocalConnectionState(connection_);
-  EXPECT_QUIC_BUG(QuicServerSessionBasePeer::GetOrCreateDynamicStream(
-                      session_.get(), GetNthClientInitiatedId(0)),
-                  "ShouldCreateIncomingDynamicStream called when disconnected");
+  if (FLAGS_quic_reloadable_flag_quic_refactor_stream_creation) {
+    EXPECT_EQ(nullptr, QuicServerSessionBasePeer::GetOrCreateDynamicStream(
+                           session_.get(), GetNthClientInitiatedId(0)));
+  } else {
+    EXPECT_QUIC_BUG(
+        QuicServerSessionBasePeer::GetOrCreateDynamicStream(
+            session_.get(), GetNthClientInitiatedId(0)),
+        "ShouldCreateIncomingDynamicStream called when disconnected");
+  }
 }
 
 class MockQuicCryptoServerStream : public QuicCryptoServerStream {