QUIC_VERSION_21: headers and crypto streams are now flow controlled at

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 f105b6e2d951f634643758dc31e0740d0810147c..94f90c6392b72c1bacf05cca854fe2d5fa908ac1 100644
--- a/net/quic/quic_headers_stream_test.cc
+++ b/net/quic/quic_headers_stream_test.cc
@@ -10,6 +10,7 @@
 #include "net/quic/test_tools/quic_connection_peer.h"
 #include "net/quic/test_tools/quic_session_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
+#include "net/quic/test_tools/reliable_quic_stream_peer.h"
 #include "net/spdy/spdy_protocol.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -324,8 +325,16 @@ TEST_P(QuicHeadersStreamTest, ProcessSpdyWindowUpdateFrame) {
   headers_stream_->ProcessRawData(frame->data(), frame->size());
 }
 
-TEST_P(QuicHeadersStreamTest, NoFlowControl) {
-  EXPECT_FALSE(headers_stream_->flow_controller()->IsEnabled());
+TEST_P(QuicHeadersStreamTest, NoConnectionLevelFlowControl) {
+  ValueRestore<bool> old_flag(&FLAGS_enable_quic_connection_flow_control_2,
+                              true);
+  if (connection_->version() <= QUIC_VERSION_20) {
+    EXPECT_FALSE(headers_stream_->flow_controller()->IsEnabled());
+  } else {
+    EXPECT_TRUE(headers_stream_->flow_controller()->IsEnabled());
+  }
+  EXPECT_FALSE(ReliableQuicStreamPeer::StreamContributesToConnectionFlowControl(
+      headers_stream_));
 }
 
 }  // namespace