Remove unused quicconnectionvisitorinterface::onforwardprogressconfirmed. not protected. PiperOrigin-RevId: 315898124 Change-Id: Ib66a65e3106ae7100829d5ccb1be14b0e607893b
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc index 18389f0..7b59c2f 100644 --- a/quic/core/quic_connection.cc +++ b/quic/core/quic_connection.cc
@@ -1198,11 +1198,6 @@ ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET); return false; } - - if (!GetLargestAckedPacket().IsInitialized() || - largest_acked > GetLargestAckedPacket()) { - visitor_->OnForwardProgressConfirmed(); - } processing_ack_frame_ = true; sent_packet_manager_.OnAckFrameStart(largest_acked, ack_delay_time, GetTimeOfLastReceivedPacket());
diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h index 56f84c2..5683c8b 100644 --- a/quic/core/quic_connection.h +++ b/quic/core/quic_connection.h
@@ -174,10 +174,6 @@ // Called to get current handshake state. virtual HandshakeState GetHandshakeState() const = 0; - // Called when an ACK is received with a larger |largest_acked| than - // previously observed. - virtual void OnForwardProgressConfirmed() = 0; - // Called when a STOP_SENDING frame has been received. virtual void OnStopSendingFrame(const QuicStopSendingFrame& frame) = 0;
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc index 6602a8c..316aa1b 100644 --- a/quic/core/quic_connection_test.cc +++ b/quic/core/quic_connection_test.cc
@@ -1156,7 +1156,6 @@ .WillRepeatedly(Return(false)); EXPECT_CALL(visitor_, OnCongestionWindowChange(_)).Times(AnyNumber()); EXPECT_CALL(visitor_, OnPacketReceived(_, _, _)).Times(AnyNumber()); - EXPECT_CALL(visitor_, OnForwardProgressConfirmed()).Times(AnyNumber()); EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_)).Times(AnyNumber()); EXPECT_CALL(visitor_, OnOneRttPacketAcknowledged()) .Times(testing::AtMost(1)); @@ -9036,45 +9035,6 @@ connection_.GetPingAlarm()->deadline() - clock_.ApproximateNow()); } -TEST_P(QuicConnectionTest, OnForwardProgressConfirmed) { - EXPECT_CALL(visitor_, OnForwardProgressConfirmed()).Times(Exactly(0)); - EXPECT_TRUE(connection_.connected()); - - const char data[] = "data"; - size_t data_size = strlen(data); - QuicStreamOffset offset = 0; - - // Send two packets. - connection_.SendStreamDataWithString(1, data, offset, NO_FIN); - offset += data_size; - connection_.SendStreamDataWithString(1, data, offset, NO_FIN); - offset += data_size; - - // Ack packet 1. This increases the largest_acked to 1, so - // OnForwardProgressConfirmed() should be called - clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(5)); - EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_)); - EXPECT_CALL(*send_algorithm_, OnCongestionEvent(true, _, _, _, _)); - EXPECT_CALL(visitor_, OnForwardProgressConfirmed()); - QuicAckFrame frame = - InitAckFrame({{QuicPacketNumber(1), QuicPacketNumber(2)}}); - ProcessAckPacket(&frame); - - // Ack packet 1 again. largest_acked remains at 1, so - // OnForwardProgressConfirmed() should not be called. - clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(5)); - frame = InitAckFrame({{QuicPacketNumber(1), QuicPacketNumber(2)}}); - ProcessAckPacket(&frame); - - // Ack packet 2. This increases the largest_acked to 2, so - // OnForwardProgressConfirmed() should be called. - clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(5)); - EXPECT_CALL(*send_algorithm_, OnCongestionEvent(true, _, _, _, _)); - EXPECT_CALL(visitor_, OnForwardProgressConfirmed()); - frame = InitAckFrame({{QuicPacketNumber(2), QuicPacketNumber(3)}}); - ProcessAckPacket(&frame); -} - TEST_P(QuicConnectionTest, ValidStatelessResetToken) { const QuicUint128 kTestToken = 1010101; const QuicUint128 kWrongTestToken = 1010100;
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc index a697dc7..dcf4962 100644 --- a/quic/core/quic_session.cc +++ b/quic/core/quic_session.cc
@@ -442,8 +442,6 @@ return false; } -void QuicSession::OnForwardProgressConfirmed() {} - void QuicSession::OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) { // Stream may be closed by the time we receive a WINDOW_UPDATE, so we can't // assume that it still exists.
diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h index 33abcfc..09b3c17 100644 --- a/quic/core/quic_session.h +++ b/quic/core/quic_session.h
@@ -124,7 +124,6 @@ void OnPathDegrading() override; bool AllowSelfAddressChange() const override; HandshakeState GetHandshakeState() const override; - void OnForwardProgressConfirmed() override; bool OnMaxStreamsFrame(const QuicMaxStreamsFrame& frame) override; bool OnStreamsBlockedFrame(const QuicStreamsBlockedFrame& frame) override; void OnStopSendingFrame(const QuicStopSendingFrame& frame) override;
diff --git a/quic/test_tools/quic_test_utils.h b/quic/test_tools/quic_test_utils.h index 8bf8549..26bd95e 100644 --- a/quic/test_tools/quic_test_utils.h +++ b/quic/test_tools/quic_test_utils.h
@@ -525,7 +525,6 @@ MOCK_METHOD(void, SendPing, (), (override)); MOCK_METHOD(bool, AllowSelfAddressChange, (), (const, override)); MOCK_METHOD(HandshakeState, GetHandshakeState, (), (const, override)); - MOCK_METHOD(void, OnForwardProgressConfirmed, (), (override)); MOCK_METHOD(bool, OnMaxStreamsFrame, (const QuicMaxStreamsFrame& frame),
diff --git a/quic/test_tools/simulator/quic_endpoint.h b/quic/test_tools/simulator/quic_endpoint.h index dfc74ee..3d0c04d 100644 --- a/quic/test_tools/simulator/quic_endpoint.h +++ b/quic/test_tools/simulator/quic_endpoint.h
@@ -80,7 +80,6 @@ void SendPing() override {} bool AllowSelfAddressChange() const override; HandshakeState GetHandshakeState() const override; - void OnForwardProgressConfirmed() override {} bool OnMaxStreamsFrame(const QuicMaxStreamsFrame& /*frame*/) override { return true; }