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

net/tools/quic/quic_client_base.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/quic_client_base.h"
 
 #include "net/quic/core/crypto/quic_random.h"
 #include "net/quic/core/quic_server_id.h"
 #include "net/quic/core/spdy_utils.h"
 #include "net/quic/platform/api/quic_flags.h"
@@ skipping 239 matching lines @@
   }
   while (WaitForEvents()) {
   }
 }
 
 QuicSpdyClientStream* QuicClientBase::CreateClientStream() {
   if (!connected()) {
     return nullptr;
   }
 
-  auto* stream = static_cast<QuicSpdyClientStream*>(
-      FLAGS_quic_reloadable_flag_quic_refactor_stream_creation
-          ? session_->MaybeCreateOutgoingDynamicStream(kDefaultPriority)
-          : session_->CreateOutgoingDynamicStream(kDefaultPriority));
+  QuicSpdyClientStream* stream =
+      session_->CreateOutgoingDynamicStream(kDefaultPriority);
   if (stream) {
     stream->set_visitor(this);
   }
   return stream;
 }
 
 bool QuicClientBase::WaitForEvents() {
   DCHECK(connected());
 
   RunEventLoop();
@@ skipping 213 matching lines @@
   QUIC_BUG_IF(!store_response_) << "Response not stored!";
   return latest_response_body_;
 }
 
 const string& QuicClientBase::latest_response_trailers() const {
   QUIC_BUG_IF(!store_response_) << "Response not stored!";
   return latest_response_trailers_;
 }
 
 }  // namespace net