Land Recent QUIC Changes.

net/quic/quic_headers_stream_test.cc

 // Copyright 2013 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_headers_stream.h"
 
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/spdy_utils.h"
 #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"
 
 using base::StringPiece;
 using std::string;
 using testing::Invoke;
 using testing::StrictMock;
 using testing::WithArgs;
 using testing::_;
 
@@ skipping 294 matching lines @@
   scoped_ptr<SpdySerializedFrame> frame(framer_.SerializeFrame(data));
   EXPECT_CALL(*connection_,
               SendConnectionCloseWithDetails(
                   QUIC_INVALID_HEADERS_STREAM_DATA,
                   "SPDY WINDOW_UPDATE frame received."))
       .WillOnce(InvokeWithoutArgs(this,
                                   &QuicHeadersStreamTest::CloseConnection));
   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
 }  // namespace test
 }  // namespace net