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

net/tools/quic/quic_client_base.cc

Index: net/tools/quic/quic_client_base.cc
diff --git a/net/tools/quic/quic_client_base.cc b/net/tools/quic/quic_client_base.cc
index b08f14423e1dd002af5554b1bcb98d6a2e1d8e2f..1a7f087b6a8155f274dcb10bbe169837aa9b8f26 100644
--- a/net/tools/quic/quic_client_base.cc
+++ b/net/tools/quic/quic_client_base.cc
@@ -257,8 +257,10 @@ QuicSpdyClientStream* QuicClientBase::CreateClientStream() {
     return nullptr;
   }
 
-  QuicSpdyClientStream* stream =
-      session_->CreateOutgoingDynamicStream(kDefaultPriority);
+  auto* stream = static_cast<QuicSpdyClientStream*>(
+      FLAGS_quic_reloadable_flag_quic_refactor_stream_creation
+          ? session_->MaybeCreateOutgoingDynamicStream(kDefaultPriority)
+          : session_->CreateOutgoingDynamicStream(kDefaultPriority));
   if (stream) {
     stream->set_visitor(this);
   }