Land Recent QUIC Changes.

net/quic/quic_crypto_stream_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_crypto_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #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"
 
 using std::string;
 using std::vector;
 
 namespace net {
 namespace test {
 namespace {
 
@@ skipping 69 matching lines @@
                              sizeof(uint16) +  // number of tag-value pairs
                              sizeof(uint16);   // padding
   EXPECT_EQ(1, bad[kFirstTagIndex]);
   bad[kFirstTagIndex] = 0x7F;  // out of order tag
 
   EXPECT_CALL(*connection_,
               SendConnectionClose(QUIC_CRYPTO_TAGS_OUT_OF_ORDER));
   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
 }  // namespace test
 }  // namespace net