| Index: net/quic/quic_connection_test.cc
|
| diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
|
| index 4f5698f7052ba5a61a9c6738c2db158f26f82f4c..e987524f4350608b607599fa7125b05d769a317c 100644
|
| --- a/net/quic/quic_connection_test.cc
|
| +++ b/net/quic/quic_connection_test.cc
|
| @@ -661,7 +661,7 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
|
| connection_.SetSendAlgorithm(send_algorithm_);
|
| connection_.SetLossAlgorithm(loss_algorithm_);
|
| framer_.set_received_entropy_calculator(&entropy_calculator_);
|
| - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _))
|
| + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _))
|
| .WillRepeatedly(Return(QuicTime::Delta::Zero()));
|
| EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _))
|
| .Times(AnyNumber());
|
| @@ -981,12 +981,12 @@ class QuicConnectionTest : public ::testing::TestWithParam<TestParams> {
|
| }
|
|
|
| void CongestionBlockWrites() {
|
| - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _))
|
| + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _))
|
| .WillRepeatedly(testing::Return(QuicTime::Delta::FromSeconds(1)));
|
| }
|
|
|
| void CongestionUnblockWrites() {
|
| - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _))
|
| + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _))
|
| .WillRepeatedly(testing::Return(QuicTime::Delta::Zero()));
|
| }
|
|
|
| @@ -1319,7 +1319,7 @@ TEST_P(QuicConnectionTest, AckReceiptCausesAckSendBadEntropy) {
|
|
|
| // Process an ack with a least unacked of the received ack.
|
| // This causes an ack to be sent when TimeUntilSend returns 0.
|
| - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _))
|
| + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _))
|
| .WillRepeatedly(testing::Return(QuicTime::Delta::Zero()));
|
| // Skip a packet and then record an ack.
|
| QuicAckFrame frame = InitAckFrame(0);
|
| @@ -1897,7 +1897,7 @@ TEST_P(QuicConnectionTest, OnCanWrite) {
|
| IgnoreResult(InvokeWithoutArgs(
|
| &connection_, &TestConnection::SendStreamData5))));
|
| EXPECT_CALL(visitor_, WillingAndAbleToWrite()).WillOnce(Return(true));
|
| - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _))
|
| + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _))
|
| .WillRepeatedly(testing::Return(QuicTime::Delta::Zero()));
|
|
|
| connection_.OnCanWrite();
|
| @@ -2505,7 +2505,7 @@ TEST_P(QuicConnectionTest, SendHandshakeMessages) {
|
| connection_.SetEncrypter(ENCRYPTION_NONE, new TaggingEncrypter(0x01));
|
|
|
| // Attempt to send a handshake message and have the socket block.
|
| - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _))
|
| + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _))
|
| .WillRepeatedly(testing::Return(QuicTime::Delta::Zero()));
|
| BlockOnNextWrite();
|
| connection_.SendStreamDataWithString(1, "foo", 0, !kFin, nullptr);
|
| @@ -3426,7 +3426,7 @@ TEST_P(QuicConnectionTest, TestQueueLimitsOnSendStreamData) {
|
| connection_.SetMaxPacketLength(length);
|
|
|
| // Queue the first packet.
|
| - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _))
|
| + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _))
|
| .WillOnce(testing::Return(QuicTime::Delta::FromMicroseconds(10)));
|
| const string payload(payload_length, 'a');
|
| EXPECT_EQ(0u,
|
| @@ -4573,7 +4573,7 @@ TEST_P(QuicConnectionTest, ReevaluateTimeUntilSendOnAck) {
|
| nullptr);
|
|
|
| // Evaluate CanWrite, and have it return a non-Zero value.
|
| - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _))
|
| + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _))
|
| .WillRepeatedly(Return(QuicTime::Delta::FromMilliseconds(1)));
|
| connection_.OnCanWrite();
|
| EXPECT_TRUE(connection_.GetSendAlarm()->IsSet());
|
| @@ -4584,7 +4584,7 @@ TEST_P(QuicConnectionTest, ReevaluateTimeUntilSendOnAck) {
|
| QuicAckFrame ack = InitAckFrame(1);
|
| EXPECT_CALL(*loss_algorithm_, DetectLosses(_, _, _, _));
|
| EXPECT_CALL(*send_algorithm_, OnCongestionEvent(true, _, _, _));
|
| - EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _, _))
|
| + EXPECT_CALL(*send_algorithm_, TimeUntilSend(_, _))
|
| .WillRepeatedly(Return(QuicTime::Delta::FromMilliseconds(2)));
|
| ProcessAckPacket(&ack);
|
| EXPECT_EQ(1u, writer_->frame_count());
|
|
|