| Index: net/tools/quic/quic_dispatcher_test.cc
|
| diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
|
| index 52943192f55674639a7025b16a27cdbde2b26343..dd6e3c55080708e2b8108a5ddd3a37e978073e7c 100644
|
| --- a/net/tools/quic/quic_dispatcher_test.cc
|
| +++ b/net/tools/quic/quic_dispatcher_test.cc
|
| @@ -449,7 +449,7 @@ TEST_F(QuicDispatcherTest, TimeWaitListManager) {
|
|
|
| // Dispatcher forwards subsequent packets for this connection_id to the time
|
| // wait list manager.
|
| - EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
|
| + EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id))
|
| .Times(1);
|
| EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
|
| .Times(0);
|
| @@ -464,7 +464,7 @@ TEST_F(QuicDispatcherTest, NoVersionPacketToTimeWaitListManager) {
|
| // Dispatcher forwards all packets for this connection_id to the time wait
|
| // list manager.
|
| EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _)).Times(0);
|
| - EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
|
| + EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id))
|
| .Times(1);
|
| EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
|
| .Times(1);
|
| @@ -479,7 +479,7 @@ TEST_F(QuicDispatcherTest, ProcessPacketWithZeroPort) {
|
|
|
| // dispatcher_ should drop this packet.
|
| EXPECT_CALL(*dispatcher_, CreateQuicSession(1, client_address)).Times(0);
|
| - EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, _, _)).Times(0);
|
| + EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, _)).Times(0);
|
| EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
|
| .Times(0);
|
| ProcessPacket(client_address, 1, true, SerializeCHLO());
|
| @@ -516,7 +516,7 @@ TEST_F(QuicDispatcherTest, TooBigSeqNoPacketToTimeWaitListManager) {
|
| // Dispatcher forwards this packet for this connection_id to the time wait
|
| // list manager.
|
| EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _)).Times(0);
|
| - EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
|
| + EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id))
|
| .Times(1);
|
| EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
|
| .Times(1);
|
| @@ -749,7 +749,7 @@ TEST_P(QuicDispatcherStatelessRejectTest, ParameterizedBasicTest) {
|
| time_wait_list_manager_->IsConnectionIdInTimeWait(connection_id));
|
| if (ExpectStatelessReject()) {
|
| // The second packet will be processed on the time-wait list.
|
| - EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
|
| + EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id))
|
| .Times(1);
|
| } else {
|
| // The second packet will trigger a packet-validation
|
| @@ -860,7 +860,7 @@ TEST_F(QuicDispatcherTestStrayPacketConnectionId,
|
| QuicConnectionId connection_id = 1;
|
| // Dispatcher drops this packet.
|
| EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _)).Times(0);
|
| - EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id, _))
|
| + EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, connection_id))
|
| .Times(0);
|
| EXPECT_CALL(*time_wait_list_manager_, AddConnectionIdToTimeWait(_, _, _, _))
|
| .Times(0);
|
| @@ -1345,7 +1345,7 @@ TEST_P(BufferedPacketStoreTest, ReceiveCHLOAfterExpiration) {
|
| // New arrived CHLO will be dropped because this connection is in time wait
|
| // list.
|
| ASSERT_TRUE(time_wait_list_manager_->IsConnectionIdInTimeWait(conn_id));
|
| - EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, conn_id, _));
|
| + EXPECT_CALL(*time_wait_list_manager_, ProcessPacket(_, _, conn_id));
|
| ProcessPacket(client_address, conn_id, true, SerializeFullCHLO());
|
| }
|
|
|
| @@ -1703,13 +1703,13 @@ TEST_F(AsyncGetProofTest, BasicReject) {
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| AddConnectionIdToTimeWait(conn_id, _, true, _));
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| - ProcessPacket(_, client_addr_, conn_id, _));
|
| + ProcessPacket(_, client_addr_, conn_id));
|
|
|
| EXPECT_CALL(check, Call(2));
|
| EXPECT_CALL(*dispatcher_, CreateQuicSession(conn_id, client_addr_))
|
| .Times(0);
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| - ProcessPacket(_, client_addr_, conn_id, _));
|
| + ProcessPacket(_, client_addr_, conn_id));
|
| }
|
|
|
| // Send a CHLO that the StatelessRejector will reject.
|
| @@ -1825,11 +1825,11 @@ TEST_F(AsyncGetProofTest, MultipleReject) {
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| AddConnectionIdToTimeWait(conn_id_2, _, true, _));
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| - ProcessPacket(_, client_addr_, conn_id_2, _));
|
| + ProcessPacket(_, client_addr_, conn_id_2));
|
|
|
| EXPECT_CALL(check, Call(2));
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| - ProcessPacket(_, client_addr_, conn_id_2, _));
|
| + ProcessPacket(_, client_addr_, conn_id_2));
|
|
|
| EXPECT_CALL(check, Call(3));
|
| EXPECT_CALL(*dispatcher_,
|
| @@ -1839,7 +1839,7 @@ TEST_F(AsyncGetProofTest, MultipleReject) {
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| AddConnectionIdToTimeWait(conn_id_1, _, true, _));
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| - ProcessPacket(_, client_addr_, conn_id_1, _));
|
| + ProcessPacket(_, client_addr_, conn_id_1));
|
| }
|
|
|
| // Send a CHLO that the StatelessRejector will reject.
|
| @@ -1898,7 +1898,7 @@ TEST_F(AsyncGetProofTest, MultipleIdenticalReject) {
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| AddConnectionIdToTimeWait(conn_id_1, _, true, _));
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| - ProcessPacket(_, client_addr_, conn_id_1, _));
|
| + ProcessPacket(_, client_addr_, conn_id_1));
|
| }
|
|
|
| // Send a CHLO that the StatelessRejector will reject.
|
| @@ -1938,7 +1938,7 @@ TEST_F(AsyncGetProofTest, BufferTimeout) {
|
|
|
| EXPECT_CALL(check, Call(2));
|
| EXPECT_CALL(*time_wait_list_manager_,
|
| - ProcessPacket(_, client_addr_, conn_id, _));
|
| + ProcessPacket(_, client_addr_, conn_id));
|
| EXPECT_CALL(*dispatcher_, CreateQuicSession(conn_id, client_addr_))
|
| .Times(0);
|
| }
|
|
|