| Index: net/quic/reliable_quic_stream_test.cc
|
| diff --git a/net/quic/reliable_quic_stream_test.cc b/net/quic/reliable_quic_stream_test.cc
|
| index 801800b821b4c4075e4fb9251d7b1fd4e576945a..8ee03b58126e6687aba5da83bb751c7109f18f56 100644
|
| --- a/net/quic/reliable_quic_stream_test.cc
|
| +++ b/net/quic/reliable_quic_stream_test.cc
|
| @@ -10,6 +10,7 @@
|
| #include "net/quic/quic_utils.h"
|
| #include "net/quic/quic_write_blocked_list.h"
|
| #include "net/quic/spdy_utils.h"
|
| +#include "net/quic/test_tools/quic_flow_controller_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"
|
| @@ -58,10 +59,6 @@ class TestStream : public ReliableQuicStream {
|
| return QuicUtils::HighestPriority();
|
| }
|
|
|
| - virtual bool IsFlowControlEnabled() const OVERRIDE {
|
| - return true;
|
| - }
|
| -
|
| using ReliableQuicStream::WriteOrBufferData;
|
| using ReliableQuicStream::CloseReadSide;
|
| using ReliableQuicStream::CloseWriteSide;
|
| @@ -321,13 +318,15 @@ TEST_F(ReliableQuicStreamTest, StreamFlowControlMultipleWindowUpdates) {
|
|
|
| // Initially should be default.
|
| EXPECT_EQ(initial_flow_control_window_bytes_,
|
| - ReliableQuicStreamPeer::SendWindowOffset(stream_.get()));
|
| + QuicFlowControllerPeer::SendWindowOffset(
|
| + stream_.get()->flow_controller()));
|
|
|
| // Check a single WINDOW_UPDATE results in correct offset.
|
| QuicWindowUpdateFrame window_update_1(stream_->id(), 1234);
|
| stream_->OnWindowUpdateFrame(window_update_1);
|
| EXPECT_EQ(window_update_1.byte_offset,
|
| - ReliableQuicStreamPeer::SendWindowOffset(stream_.get()));
|
| + QuicFlowControllerPeer::SendWindowOffset(
|
| + stream_.get()->flow_controller()));
|
|
|
| // Now send a few more WINDOW_UPDATES and make sure that only the largest is
|
| // remembered.
|
| @@ -338,7 +337,8 @@ TEST_F(ReliableQuicStreamTest, StreamFlowControlMultipleWindowUpdates) {
|
| stream_->OnWindowUpdateFrame(window_update_3);
|
| stream_->OnWindowUpdateFrame(window_update_4);
|
| EXPECT_EQ(window_update_3.byte_offset,
|
| - ReliableQuicStreamPeer::SendWindowOffset(stream_.get()));
|
| + QuicFlowControllerPeer::SendWindowOffset(
|
| + stream_.get()->flow_controller()));
|
| }
|
|
|
| void SaveProxyAckNotifierDelegate(
|
| @@ -359,6 +359,9 @@ TEST_F(ReliableQuicStreamTest, WriteOrBufferDataWithQuicAckNotifier) {
|
| const int kSecondWriteSize = 50;
|
| const int kLastWriteSize = kDataSize - kFirstWriteSize - kSecondWriteSize;
|
|
|
| + // Set a large flow control send window so this doesn't interfere with test.
|
| + stream_->flow_controller()->UpdateSendWindowOffset(kDataSize + 1);
|
| +
|
| scoped_refptr<QuicAckNotifier::DelegateInterface> proxy_delegate;
|
|
|
| EXPECT_CALL(*session_, WritevData(kStreamId, _, _, _, _)).WillOnce(DoAll(
|
| @@ -408,6 +411,9 @@ TEST_F(ReliableQuicStreamTest, WriteOrBufferDataAckNotificationBeforeFlush) {
|
|
|
| const int kInitialWriteSize = 100;
|
|
|
| + // Set a large flow control send window so this doesn't interfere with test.
|
| + stream_->flow_controller()->UpdateSendWindowOffset(kDataSize + 1);
|
| +
|
| scoped_refptr<QuicAckNotifier::DelegateInterface> proxy_delegate;
|
|
|
| EXPECT_CALL(*session_, WritevData(kStreamId, _, _, _, _)).WillOnce(DoAll(
|
|
|