Land Recent QUIC Changes.

net/quic/quic_flow_controller_test.cc

 // Copyright 2014 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_flow_controller.h"
 
 #include "base/strings/stringprintf.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/quic_flow_controller_peer.h"
@@ skipping 79 matching lines @@
 }
 
 TEST_F(QuicFlowControllerTest, ReceivingBytes) {
   Initialize();
 
   EXPECT_TRUE(flow_controller_->IsEnabled());
   EXPECT_FALSE(flow_controller_->IsBlocked());
   EXPECT_FALSE(flow_controller_->FlowControlViolation());
 
   // Buffer some bytes, not enough to fill window.
-  flow_controller_->AddBytesBuffered(receive_window_ / 2);
+  EXPECT_TRUE(
+      flow_controller_->UpdateHighestReceivedOffset(1 + receive_window_ / 2));
   EXPECT_FALSE(flow_controller_->FlowControlViolation());
-  EXPECT_EQ(receive_window_ / 2,
+  EXPECT_EQ((receive_window_ / 2) - 1,
             QuicFlowControllerPeer::ReceiveWindowSize(flow_controller_.get()));
 
   // Consume enough bytes to send a WINDOW_UPDATE frame.
-  flow_controller_->RemoveBytesBuffered(receive_window_ / 2);
   flow_controller_->AddBytesConsumed(1 + receive_window_ / 2);
   EXPECT_FALSE(flow_controller_->FlowControlViolation());
   EXPECT_EQ((receive_window_ / 2) - 1,
             QuicFlowControllerPeer::ReceiveWindowSize(flow_controller_.get()));
 
   MockConnection connection(false);
   EXPECT_CALL(connection, SendWindowUpdate(stream_id_, _)).Times(1);
   flow_controller_->MaybeSendWindowUpdate(&connection);
 }
 
 TEST_F(QuicFlowControllerTest,
        DisabledWhenQuicVersionDoesNotSupportFlowControl) {
   set_version(QUIC_VERSION_16);
   Initialize();
 
   // Should not be enabled, and should not report as blocked.
   EXPECT_FALSE(flow_controller_->IsEnabled());
   EXPECT_FALSE(flow_controller_->IsBlocked());
   EXPECT_FALSE(flow_controller_->FlowControlViolation());
 
   // Any attempts to add/remove bytes should have no effect.
   EXPECT_EQ(send_window_, flow_controller_->SendWindowSize());
   EXPECT_EQ(send_window_,
             QuicFlowControllerPeer::SendWindowOffset(flow_controller_.get()));
   EXPECT_EQ(receive_window_, QuicFlowControllerPeer::ReceiveWindowOffset(
                                  flow_controller_.get()));
   flow_controller_->AddBytesSent(123);
   flow_controller_->AddBytesConsumed(456);
-  flow_controller_->AddBytesBuffered(789);
-  flow_controller_->RemoveBytesBuffered(321);
+  flow_controller_->UpdateHighestReceivedOffset(789);
   EXPECT_EQ(send_window_, flow_controller_->SendWindowSize());
   EXPECT_EQ(send_window_,
             QuicFlowControllerPeer::SendWindowOffset(flow_controller_.get()));
   EXPECT_EQ(receive_window_, QuicFlowControllerPeer::ReceiveWindowOffset(
                                  flow_controller_.get()));
 
   // Any attempt to change offset should have no effect.
   EXPECT_EQ(send_window_, flow_controller_->SendWindowSize());
   EXPECT_EQ(send_window_,
             QuicFlowControllerPeer::SendWindowOffset(flow_controller_.get()));
@@ skipping 63 matching lines @@
   flow_controller_->AddBytesSent(send_window_);
   EXPECT_TRUE(flow_controller_->IsBlocked());
   EXPECT_EQ(0u, flow_controller_->SendWindowSize());
 
   // BLOCKED frame should get sent as send offset has changed.
   flow_controller_->MaybeSendBlocked(&connection);
 }
 
 }  // namespace test
 }  // namespace net