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

net/tools/quic/quic_client_session_test.cc

Index: net/tools/quic/quic_client_session_test.cc
diff --git a/net/tools/quic/quic_client_session_test.cc b/net/tools/quic/quic_client_session_test.cc
index 137eacf7cba94b62d3dfbad50554df3c97719dd8..b4b09e7e4ca96109926675d87322e3b6d824067e 100644
--- a/net/tools/quic/quic_client_session_test.cc
+++ b/net/tools/quic/quic_client_session_test.cc
@@ -54,12 +54,23 @@ class TestQuicClientSession : public QuicClientSession {
                                                     this);
   }
 
+  std::unique_ptr<QuicStream> CreateStream(QuicStreamId id) override {
+    return QuicMakeUnique<MockQuicSpdyClientStream>(id, this);
+  }
+
   MockQuicSpdyClientStream* CreateIncomingDynamicStream(
       QuicStreamId id) override {
     MockQuicSpdyClientStream* stream = new MockQuicSpdyClientStream(id, this);
     ActivateStream(QuicWrapUnique(stream));
     return stream;
   }
+
+  QuicSpdyClientStream* CreateOutgoingDynamicStream(
+      SpdyPriority priority) override {
+    return FLAGS_quic_reloadable_flag_quic_refactor_stream_creation
+               ? MaybeCreateOutgoingDynamicStream(priority)
+               : QuicClientSession::CreateOutgoingDynamicStream(priority);
+  }
 };
 
 class QuicClientSessionTest : public QuicTestWithParam<QuicVersion> {
@@ -163,8 +174,12 @@ TEST_P(QuicClientSessionTest, NoEncryptionAfterInitialEncryption) {
             QuicPacketCreatorPeer::GetEncryptionLevel(
                 QuicConnectionPeer::GetPacketCreator(connection_)));
   // Verify that no new streams may be created.
-  EXPECT_TRUE(session_->CreateOutgoingDynamicStream(kDefaultPriority) ==
-              nullptr);
+  if (FLAGS_quic_reloadable_flag_quic_refactor_stream_creation) {
+    EXPECT_EQ(nullptr, session_->CreateOutgoingDynamicStream(kDefaultPriority));
+  } else {
+    EXPECT_TRUE(session_->CreateOutgoingDynamicStream(kDefaultPriority) ==
+                nullptr);
+  }
   // Verify that no data may be send on existing streams.
   char data[] = "hello world";
   struct iovec iov = {data, arraysize(data)};