Update from https://crrev.com/311076

net/quic/quic_headers_stream_test.cc

Index: net/quic/quic_headers_stream_test.cc
diff --git a/net/quic/quic_headers_stream_test.cc b/net/quic/quic_headers_stream_test.cc
index 446b73f130fadba71ce0d28e515e8692bc069805..89c87f29c29e8c30a33f01cde77080133b754a1c 100644
--- a/net/quic/quic_headers_stream_test.cc
+++ b/net/quic/quic_headers_stream_test.cc
@@ -336,11 +336,7 @@ TEST_P(QuicHeadersStreamTest, ProcessSpdyWindowUpdateFrame) {
 }
 
 TEST_P(QuicHeadersStreamTest, NoConnectionLevelFlowControl) {
-  if (connection_->version() < QUIC_VERSION_21) {
-    EXPECT_FALSE(headers_stream_->flow_controller()->IsEnabled());
-  } else {
-    EXPECT_TRUE(headers_stream_->flow_controller()->IsEnabled());
-  }
+  EXPECT_TRUE(headers_stream_->flow_controller()->IsEnabled());
   EXPECT_FALSE(ReliableQuicStreamPeer::StreamContributesToConnectionFlowControl(
       headers_stream_));
 }