Land Recent QUIC Changes.

net/quic/quic_crypto_stream_test.cc

Index: net/quic/quic_crypto_stream_test.cc
diff --git a/net/quic/quic_crypto_stream_test.cc b/net/quic/quic_crypto_stream_test.cc
index 536b1512222a052e46680430ad7fd487a9a2cfac..b21d5c0108bee11ea41140f99d712cb3fe0657c0 100644
--- a/net/quic/quic_crypto_stream_test.cc
+++ b/net/quic/quic_crypto_stream_test.cc
@@ -13,6 +13,7 @@
 #include "net/quic/quic_flags.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
+#include "net/quic/test_tools/reliable_quic_stream_peer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -102,8 +103,16 @@ TEST_F(QuicCryptoStreamTest, ProcessBadData) {
   EXPECT_EQ(0u, stream_.ProcessRawData(bad.data(), bad.length()));
 }
 
-TEST_F(QuicCryptoStreamTest, NoFlowControl) {
-  EXPECT_FALSE(stream_.flow_controller()->IsEnabled());
+TEST_F(QuicCryptoStreamTest, NoConnectionLevelFlowControl) {
+  ValueRestore<bool> old_flag(&FLAGS_enable_quic_connection_flow_control_2,
+                              true);
+  if (connection_->version() <= QUIC_VERSION_20) {
+    EXPECT_FALSE(stream_.flow_controller()->IsEnabled());
+  } else {
+    EXPECT_TRUE(stream_.flow_controller()->IsEnabled());
+  }
+  EXPECT_FALSE(ReliableQuicStreamPeer::StreamContributesToConnectionFlowControl(
+      &stream_));
 }
 
 }  // namespace