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

net/tools/quic/test_tools/quic_test_server.cc

Index: net/tools/quic/test_tools/quic_test_server.cc
diff --git a/net/tools/quic/test_tools/quic_test_server.cc b/net/tools/quic/test_tools/quic_test_server.cc
index a99706f96b30bd4bcd60c76ef22b1c9f76bd49f0..95bf8d2c9e79d555a5c65e82fd6a26fb52731a67 100644
--- a/net/tools/quic/test_tools/quic_test_server.cc
+++ b/net/tools/quic/test_tools/quic_test_server.cc
@@ -38,7 +38,6 @@
         crypto_stream_factory_(crypto_stream_factory) {}
 
   QuicSpdyStream* CreateIncomingDynamicStream(QuicStreamId id) override {
-    DCHECK(!FLAGS_quic_reloadable_flag_quic_refactor_stream_creation);
     if (!ShouldCreateIncomingDynamicStream(id)) {
       return nullptr;
     }
@@ -49,14 +48,6 @@
       return stream;
     }
     return QuicSimpleServerSession::CreateIncomingDynamicStream(id);
-  }
-
-  std::unique_ptr<QuicStream> CreateStream(QuicStreamId id) override {
-    if (stream_factory_) {
-      return QuicWrapUnique<QuicSpdyStream>(
-          stream_factory_->CreateStream(id, this, response_cache()));
-    }
-    return QuicSimpleServerSession::CreateStream(id);
   }
 
   QuicCryptoServerStreamBase* CreateQuicCryptoServerStream(