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

net/tools/quic/quic_client_session.cc

Index: net/tools/quic/quic_client_session.cc
diff --git a/net/tools/quic/quic_client_session.cc b/net/tools/quic/quic_client_session.cc
index a7408da68946cd7ca14608919414005dad5812aa..d1808d729767396370277f69f5a84898bbcf16c5 100644
--- a/net/tools/quic/quic_client_session.cc
+++ b/net/tools/quic/quic_client_session.cc
@@ -8,7 +8,6 @@
 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/core/quic_server_id.h"
-#include "net/quic/core/spdy_utils.h"
 #include "net/quic/platform/api/quic_bug_tracker.h"
 #include "net/quic/platform/api/quic_logging.h"
 #include "net/quic/platform/api/quic_ptr_util.h"
@@ -26,7 +25,8 @@
     QuicClientPushPromiseIndex* push_promise_index)
     : QuicClientSessionBase(connection, push_promise_index, config),
       server_id_(server_id),
-      crypto_config_(crypto_config) {}
+      crypto_config_(crypto_config),
+      respect_goaway_(true) {}
 
 QuicClientSession::~QuicClientSession() {}
 
@@ -42,7 +42,6 @@
     const ProofVerifyDetails& /*verify_details*/) {}
 
 bool QuicClientSession::ShouldCreateOutgoingDynamicStream() {
-  DCHECK(!FLAGS_quic_reloadable_flag_quic_refactor_stream_creation);
   if (!crypto_stream_->encryption_established()) {
     QUIC_DLOG(INFO) << "Encryption not active so no outgoing stream created.";
     return false;
@@ -52,7 +51,7 @@
                     << "Already " << GetNumOpenOutgoingStreams() << " open.";
     return false;
   }
-  if (goaway_received() && respect_goaway()) {
+  if (goaway_received() && respect_goaway_) {
     QUIC_DLOG(INFO) << "Failed to create a new outgoing stream. "
                     << "Already received goaway.";
     return false;
@@ -98,12 +97,11 @@
 }
 
 bool QuicClientSession::ShouldCreateIncomingDynamicStream(QuicStreamId id) {
-  DCHECK(!FLAGS_quic_reloadable_flag_quic_refactor_stream_creation);
   if (!connection()->connected()) {
     QUIC_BUG << "ShouldCreateIncomingDynamicStream called when disconnected";
     return false;
   }
-  if (goaway_received() && respect_goaway()) {
+  if (goaway_received() && respect_goaway_) {
     QUIC_DLOG(INFO) << "Failed to create a new outgoing stream. "
                     << "Already received goaway.";
     return false;
@@ -140,25 +138,4 @@
   return true;
 }
 
-QuicSpdyClientStream* QuicClientSession::MaybeCreateOutgoingDynamicStream(
-    SpdyPriority priority) {
-  return static_cast<QuicSpdyClientStream*>(
-      QuicSpdySession::MaybeCreateOutgoingDynamicStream(priority));
-}
-
-QuicSpdyStream* QuicClientSession::MaybeCreateIncomingDynamicStream(
-    QuicStreamId id) {
-  QuicSpdyStream* stream =
-      QuicSpdySession::MaybeCreateIncomingDynamicStream(id);
-  if (stream) {
-    // Push streams start half-closed.
-    stream->CloseWriteSide();
-  }
-  return stream;
-}
-
-std::unique_ptr<QuicStream> QuicClientSession::CreateStream(QuicStreamId id) {
-  return QuicMakeUnique<QuicSpdyClientStream>(id, this);
-}
-
 }  // namespace net