Land Recent QUIC Changes.

net/quic/quic_session_test.cc

Index: net/quic/quic_session_test.cc
diff --git a/net/quic/quic_session_test.cc b/net/quic/quic_session_test.cc
index 134cd252a0875eb16ed8ad2dfc6b545702cdf6d6..9cb235d9fc2476fe95229faaccca760ae424a5c6 100644
--- a/net/quic/quic_session_test.cc
+++ b/net/quic/quic_session_test.cc
@@ -631,7 +631,7 @@ TEST_P(QuicSessionTest, MultipleRstStreamsCauseSingleConnectionClose) {
 TEST_P(QuicSessionTest, HandshakeUnblocksFlowControlBlockedStream) {
   // Test that if a stream is flow control blocked, then on receipt of the SHLO
   // containing a suitable send window offset, the stream becomes unblocked.
-  if (version() < QUIC_VERSION_17) {
+  if (version() <= QUIC_VERSION_16) {
     return;
   }
 
@@ -864,7 +864,7 @@ TEST_P(QuicSessionTest, ConnectionFlowControlAccountingRstAfterRst) {
 TEST_P(QuicSessionTest, FlowControlWithInvalidFinalOffset) {
   // Test that if we receive a stream RST with a highest byte offset that
   // violates flow control, that we close the connection.
-  if (version() < QUIC_VERSION_17) {
+  if (version() <= QUIC_VERSION_16) {
     return;
   }
   ValueRestore<bool> old_flag(&FLAGS_enable_quic_connection_flow_control_2,
@@ -904,9 +904,9 @@ TEST_P(QuicSessionTest, VersionNegotiationDisablesFlowControl) {
   EXPECT_TRUE(stream->flow_controller()->IsEnabled());
   EXPECT_TRUE(session_.flow_controller()->IsEnabled());
 
-  // Version 17 implies that stream flow control is enabled, but connection
+  // Version 18 implies that stream flow control is enabled, but connection
   // level is disabled.
-  session_.OnSuccessfulVersionNegotiation(QUIC_VERSION_17);
+  session_.OnSuccessfulVersionNegotiation(QUIC_VERSION_18);
   EXPECT_FALSE(session_.flow_controller()->IsEnabled());
   EXPECT_TRUE(stream->flow_controller()->IsEnabled());