| Index: net/quic/quic_flow_controller_test.cc
|
| diff --git a/net/quic/quic_flow_controller_test.cc b/net/quic/quic_flow_controller_test.cc
|
| index f0bf629d0ef1e4d208ba7f863a2b94c8dd8b039a..0d4e7f82d8baf8a25e7e6c0cb657e266f93fd9e0 100644
|
| --- a/net/quic/quic_flow_controller_test.cc
|
| +++ b/net/quic/quic_flow_controller_test.cc
|
| @@ -27,12 +27,14 @@ class QuicFlowControllerTest : public ::testing::Test {
|
| receive_window_(200),
|
| max_receive_window_(200),
|
| version_(QuicVersionMax()),
|
| - old_flag_(&FLAGS_enable_quic_stream_flow_control_2, true) {
|
| - }
|
| + old_flag_(&FLAGS_enable_quic_stream_flow_control_2, true) {}
|
|
|
| void Initialize() {
|
| - flow_controller_.reset(new QuicFlowController(version_, stream_id_, false,
|
| - send_window_, receive_window_,
|
| + flow_controller_.reset(new QuicFlowController(version_,
|
| + stream_id_,
|
| + false,
|
| + send_window_,
|
| + receive_window_,
|
| max_receive_window_));
|
| }
|
|
|
| @@ -81,10 +83,9 @@ TEST_F(QuicFlowControllerTest, SendingBytes) {
|
| EXPECT_EQ(send_window_, flow_controller_->SendWindowSize());
|
|
|
| // Try to send more bytes, violating flow control.
|
| - EXPECT_DFATAL(
|
| - flow_controller_->AddBytesSent(send_window_ * 10),
|
| - StringPrintf("Trying to send an extra %d bytes",
|
| - static_cast<int>(send_window_ * 10)));
|
| + EXPECT_DFATAL(flow_controller_->AddBytesSent(send_window_ * 10),
|
| + StringPrintf("Trying to send an extra %d bytes",
|
| + static_cast<int>(send_window_ * 10)));
|
| EXPECT_TRUE(flow_controller_->IsBlocked());
|
| EXPECT_EQ(0u, flow_controller_->SendWindowSize());
|
| }
|
| @@ -128,8 +129,9 @@ TEST_F(QuicFlowControllerTest,
|
| 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()));
|
| + EXPECT_EQ(
|
| + receive_window_,
|
| + QuicFlowControllerPeer::ReceiveWindowOffset(flow_controller_.get()));
|
| flow_controller_->AddBytesSent(123);
|
| flow_controller_->AddBytesConsumed(456);
|
| flow_controller_->AddBytesBuffered(789);
|
| @@ -137,8 +139,9 @@ TEST_F(QuicFlowControllerTest,
|
| 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()));
|
| + 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());
|
|
|