Deprecate FLAGS_quic_disable_pre_30. Remove QUIC versions [25-29].

net/tools/quic/end_to_end_test.cc

Index: net/tools/quic/end_to_end_test.cc
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 38d2ed10b478fbc0d4288406b226cd9b5292bb4a..c9a0a94d70f12e3809d22b4bb94458a1fe2bf3e6 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -153,30 +153,26 @@ vector<TestParams> GetTestParams() {
   // to do 0-RTT across incompatible versions. Chromium only supports
   // a single version at a time anyway. :)
   QuicVersionVector all_supported_versions = QuicSupportedVersions();
-  QuicVersionVector version_buckets[5];
+  QuicVersionVector version_buckets[4];
 
   for (const QuicVersion version : all_supported_versions) {
-    if (version <= QUIC_VERSION_25) {
-      // Versions: 25
-      // SPDY/4
-      version_buckets[0].push_back(version);
-    } else if (version <= QUIC_VERSION_30) {
-      // Versions: 26-30
+    if (version <= QUIC_VERSION_30) {
+      // Versions: 30
       // v26 adds a hash of the expected leaf cert in the XLCT tag.
-      version_buckets[1].push_back(version);
+      version_buckets[0].push_back(version);
     } else if (version <= QUIC_VERSION_32) {
       // Versions: 31-32
       // v31 adds a hash of the CHLO into the proof signature.
-      version_buckets[2].push_back(version);
+      version_buckets[1].push_back(version);
     } else if (version <= QUIC_VERSION_33) {
       // Versions: 33
       // v33 adds a diversification nonce into the hkdf.
-      version_buckets[3].push_back(version);
+      version_buckets[2].push_back(version);
     } else {
       // Versions: 34+
       // QUIC_VERSION_34 deprecates entropy and uses new ack and stop waiting
       // wire formats.
-      version_buckets[4].push_back(version);
+      version_buckets[3].push_back(version);
     }
   }
 
@@ -222,10 +218,6 @@ vector<TestParams> GetTestParams() {
               }
 
               for (const QuicVersionVector& client_versions : version_buckets) {
-                if (client_versions.front() < QUIC_VERSION_30 &&
-                    FLAGS_quic_disable_pre_30) {
-                  continue;
-                }
                 CHECK(!client_versions.empty());
                 // Add an entry for server and client supporting all versions.
                 params.push_back(TestParams(
@@ -249,10 +241,6 @@ vector<TestParams> GetTestParams() {
                 // because it is essentially the same as the default
                 // case.
                 for (size_t i = 1; i < client_versions.size(); ++i) {
-                  if (client_versions[i] < QUIC_VERSION_30 &&
-                      FLAGS_quic_disable_pre_30) {
-                    continue;
-                  }
                   QuicVersionVector server_supported_versions;
                   server_supported_versions.push_back(client_versions[i]);
                   params.push_back(TestParams(
@@ -1224,15 +1212,9 @@ TEST_P(EndToEndTest, NegotiateMaxOpenStreams) {
   }
   client_->WaitForResponse();
 
-  if (negotiated_version_ <= QUIC_VERSION_27) {
-    EXPECT_FALSE(client_->connected());
-    EXPECT_EQ(QUIC_STREAM_CONNECTION_ERROR, client_->stream_error());
-    EXPECT_EQ(QUIC_TOO_MANY_OPEN_STREAMS, client_->connection_error());
-  } else {
-    EXPECT_TRUE(client_->connected());
-    EXPECT_EQ(QUIC_REFUSED_STREAM, client_->stream_error());
-    EXPECT_EQ(QUIC_NO_ERROR, client_->connection_error());
-  }
+  EXPECT_TRUE(client_->connected());
+  EXPECT_EQ(QUIC_REFUSED_STREAM, client_->stream_error());
+  EXPECT_EQ(QUIC_NO_ERROR, client_->connection_error());
 }
 
 TEST_P(EndToEndTest, MaxIncomingDynamicStreamsLimitRespected) {
@@ -2411,7 +2393,6 @@ TEST_P(EndToEndTest, LargePostEarlyResponse) {
   // POST to a URL that gets an early error response, after the headers are
   // received and before the body is received.
   HTTPMessage request(HttpConstants::HTTP_1_1, HttpConstants::POST, "/garbage");
-  const uint32_t kBodySize = 2 * kWindowSize;
   // Invalid content-length so the request will receive an early 500 response.
   request.AddHeader("content-length", "-1");
   request.set_skip_message_validation(true);
@@ -2425,28 +2406,11 @@ TEST_P(EndToEndTest, LargePostEarlyResponse) {
   client_->WaitForInitialResponse();
   EXPECT_EQ(500u, client_->response_headers()->parsed_response_code());
 
-  if (negotiated_version_ > QUIC_VERSION_28) {
-    // Receive the reset stream from server on early response.
-    client_->WaitForResponseForMs(100);
-    ReliableQuicStream* stream =
-        client_->client()->session()->GetOrCreateStream(kClientDataStreamId1);
-    // The stream is reset by server's reset stream.
-    EXPECT_EQ(stream, nullptr);
-    return;
-  }
-
-  // Send a body larger than the stream flow control window.
-  string body;
-  GenerateBody(&body, kBodySize);
-  client_->SendData(body, true);
-
-  // Run the client to let any buffered data be sent.
-  // (This is OK despite already waiting for a response.)
-  client_->WaitForResponse();
-  // There should be no buffered data to write in the client's stream.
+  // Receive the reset stream from server on early response.
   ReliableQuicStream* stream =
       client_->client()->session()->GetOrCreateStream(kClientDataStreamId1);
-  EXPECT_FALSE(stream != nullptr && stream->HasBufferedData());
+  // The stream is reset by server's reset stream.
+  EXPECT_EQ(stream, nullptr);
 }
 
 TEST_P(EndToEndTest, Trailers) {