| Index: net/quic/quic_connection_test.cc
|
| diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
|
| index 63cf071578ead3cadf7629bc6f8b999ba7bb6d8e..ebc588d9f30731c3581316d204053461ab449316 100644
|
| --- a/net/quic/quic_connection_test.cc
|
| +++ b/net/quic/quic_connection_test.cc
|
| @@ -4147,7 +4147,7 @@ TEST_P(QuicConnectionTest, AckNotifierTriggerCallback) {
|
|
|
| // Create a delegate which we expect to be called.
|
| scoped_refptr<MockAckNotifierDelegate> delegate(new MockAckNotifierDelegate);
|
| - EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _, _, _)).Times(1);
|
| + EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _)).Times(1);
|
|
|
| // Send some data, which will register the delegate to be notified.
|
| connection_.SendStreamDataWithString(1, "foo", 0, !kFin, delegate.get());
|
| @@ -4163,7 +4163,7 @@ TEST_P(QuicConnectionTest, AckNotifierFailToTriggerCallback) {
|
|
|
| // Create a delegate which we don't expect to be called.
|
| scoped_refptr<MockAckNotifierDelegate> delegate(new MockAckNotifierDelegate);
|
| - EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _, _, _)).Times(0);
|
| + EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _)).Times(0);
|
|
|
| // Send some data, which will register the delegate to be notified. This will
|
| // not be ACKed and so the delegate should never be called.
|
| @@ -4190,7 +4190,7 @@ TEST_P(QuicConnectionTest, AckNotifierCallbackAfterRetransmission) {
|
|
|
| // Create a delegate which we expect to be called.
|
| scoped_refptr<MockAckNotifierDelegate> delegate(new MockAckNotifierDelegate);
|
| - EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _, _, _)).Times(1);
|
| + EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _)).Times(1);
|
|
|
| // Send four packets, and register to be notified on ACK of packet 2.
|
| connection_.SendStreamDataWithString(3, "foo", 0, !kFin, nullptr);
|
| @@ -4247,7 +4247,7 @@ TEST_P(QuicConnectionTest, AckNotifierCallbackForAckAfterRTO) {
|
|
|
| // Ack the original packet, which will revert the RTO.
|
| EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
|
| - EXPECT_CALL(*delegate.get(), OnAckNotification(1, _, 1, _, _));
|
| + EXPECT_CALL(*delegate.get(), OnAckNotification(1, _, _));
|
| EXPECT_CALL(*send_algorithm_, RevertRetransmissionTimeout());
|
| EXPECT_CALL(*send_algorithm_, OnCongestionEvent(true, _, _, _));
|
| QuicAckFrame ack_frame = InitAckFrame(1);
|
| @@ -4289,7 +4289,7 @@ TEST_P(QuicConnectionTest, AckNotifierCallbackForAckOfNackedPacket) {
|
|
|
| // Now we get an ACK for packet 2, which was previously nacked.
|
| SequenceNumberSet no_lost_packets;
|
| - EXPECT_CALL(*delegate.get(), OnAckNotification(1, _, 1, _, _));
|
| + EXPECT_CALL(*delegate.get(), OnAckNotification(1, _, _));
|
| EXPECT_CALL(*loss_algorithm_, DetectLostPackets(_, _, _, _))
|
| .WillOnce(Return(no_lost_packets));
|
| QuicAckFrame second_ack_frame = InitAckFrame(4);
|
| @@ -4310,7 +4310,7 @@ TEST_P(QuicConnectionTest, AckNotifierFECTriggerCallback) {
|
| // Create a delegate which we expect to be called.
|
| scoped_refptr<MockAckNotifierDelegate> delegate(
|
| new MockAckNotifierDelegate);
|
| - EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _, _, _)).Times(1);
|
| + EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _)).Times(1);
|
|
|
| // Send some data, which will register the delegate to be notified.
|
| connection_.SendStreamDataWithString(1, "foo", 0, !kFin, delegate.get());
|
| @@ -4333,7 +4333,7 @@ TEST_P(QuicConnectionTest, AckNotifierCallbackAfterFECRecovery) {
|
|
|
| // Create a delegate which we expect to be called.
|
| scoped_refptr<MockAckNotifierDelegate> delegate(new MockAckNotifierDelegate);
|
| - EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _, _, _)).Times(1);
|
| + EXPECT_CALL(*delegate.get(), OnAckNotification(_, _, _)).Times(1);
|
|
|
| // Expect ACKs for 1 packet.
|
| EXPECT_CALL(*send_algorithm_, OnCongestionEvent(true, _, _, _));
|
|
|