Land Recent QUIC Changes.

net/quic/reliable_quic_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/reliable_quic_stream.h"
 
 #include "net/quic/quic_ack_notifier.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/quic_write_blocked_list.h"
@@ skipping 408 matching lines @@
   QuicWindowUpdateFrame window_update_3(stream_->id(), 9999);
   QuicWindowUpdateFrame window_update_4(stream_->id(), 5678);
   stream_->OnWindowUpdateFrame(window_update_2);
   stream_->OnWindowUpdateFrame(window_update_3);
   stream_->OnWindowUpdateFrame(window_update_4);
   EXPECT_EQ(
       window_update_3.byte_offset,
       QuicFlowControllerPeer::SendWindowOffset(stream_->flow_controller()));
 }
 
-TEST_F(ReliableQuicStreamTest, StreamFlowControlShouldNotBlockInLessThanQ017) {
-  // TODO(rjshade): Remove this test when we no longer have any versions <
-  //                QUIC_VERSION_17.
-
-  // Make sure we are using a version which does not support flow control.
-  QuicVersion kTestQuicVersions[] = {QUIC_VERSION_16};
-  QuicVersionVector versions;
-  for (size_t i = 0; i < arraysize(kTestQuicVersions); ++i) {
-    versions.push_back(kTestQuicVersions[i]);
-  }
-  set_supported_versions(versions);
-
-  // Peer is not talking QUIC_VERSION_17 so assumes that it can send a zero
-  // length flow control receive window with no consequences.
-  set_initial_flow_control_window_bytes(0);
-
-  Initialize(kShouldProcessData);
-
-  // The stream should _not_ be flow control blocked, because we are not talking
-  // a version which has flow control enabled.
-  EXPECT_FALSE(stream_->flow_controller()->IsBlocked());
-}
-
 void SaveProxyAckNotifierDelegate(
     scoped_refptr<QuicAckNotifier::DelegateInterface>* delegate_out,
     QuicAckNotifier::DelegateInterface* delegate) {
   *delegate_out = delegate;
 }
 
 TEST_F(ReliableQuicStreamTest, WriteOrBufferDataWithQuicAckNotifier) {
   Initialize(kShouldProcessData);
 
   scoped_refptr<MockAckNotifierDelegate> delegate(
@@ skipping 204 matching lines @@
 
   EXPECT_FALSE(stream_->HasFinalReceivedByteOffset());
   QuicRstStreamFrame rst_frame(stream_->id(), QUIC_STREAM_CANCELLED, 1234);
   stream_->OnStreamReset(rst_frame);
   EXPECT_TRUE(stream_->HasFinalReceivedByteOffset());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net