Remove unused |send_feedback| argument.
This argument has been unused for more than five years,
since https://crrev.com/864673002.
Change-Id: I9bd694c1ab6c9412e3315b6273199f7d0a5c4e4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2184835
Commit-Queue: Bence Béky <[email protected]>
Reviewed-by: David Schinazi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#766688}
diff --git a/net/quic/bidirectional_stream_quic_impl_unittest.cc b/net/quic/bidirectional_stream_quic_impl_unittest.cc
index 2fd6655..6cfc33e 100644
--- a/net/quic/bidirectional_stream_quic_impl_unittest.cc
+++ b/net/quic/bidirectional_stream_quic_impl_unittest.cc
@@ -425,7 +425,6 @@
protected:
static const bool kFin = true;
static const bool kIncludeVersion = true;
- static const bool kIncludeCongestionFeedback = true;
// Holds a packet to be written to the wire, and the IO mode that should
// be used by the mock socket when performing the write.
@@ -742,7 +741,7 @@
return client_maker_.MakeAckAndRstPacket(
++packet_number_, !kIncludeVersion, stream_id_,
quic::QUIC_STREAM_CANCELLED, largest_received, smallest_received,
- least_unacked, !kIncludeCongestionFeedback);
+ least_unacked);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructAckAndDataPacket(
@@ -768,8 +767,7 @@
uint64_t smallest_received,
uint64_t least_unacked) {
return client_maker_.MakeAckPacket(++packet_number_, largest_received,
- smallest_received, least_unacked,
- !kIncludeCongestionFeedback);
+ smallest_received, least_unacked);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructServerAckPacket(
@@ -778,8 +776,7 @@
uint64_t smallest_received,
uint64_t least_unacked) {
return server_maker_.MakeAckPacket(packet_number, largest_received,
- smallest_received, least_unacked,
- !kIncludeCongestionFeedback);
+ smallest_received, least_unacked);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructInitialSettingsPacket() {
diff --git a/net/quic/quic_chromium_client_session_test.cc b/net/quic/quic_chromium_client_session_test.cc
index 2893077..7e6f898 100644
--- a/net/quic/quic_chromium_client_session_test.cc
+++ b/net/quic/quic_chromium_client_session_test.cc
@@ -1995,8 +1995,8 @@
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakePingPacket(packet_num++, true));
- quic_data.AddRead(
- ASYNC, server_maker_.MakeAckPacket(1, packet_num - 1, 1, 1, false));
+ quic_data.AddRead(ASYNC,
+ server_maker_.MakeAckPacket(1, packet_num - 1, 1, 1));
quic_data.AddWrite(SYNCHRONOUS,
client_maker_.MakePingPacket(packet_num++, false));
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index bcb1def7..c563886 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -209,7 +209,6 @@
protected:
static const bool kFin = true;
static const bool kIncludeVersion = true;
- static const bool kIncludeCongestionFeedback = true;
// Holds a packet to be written to the wire, and the IO mode that should
// be used by the mock socket when performing the write.
@@ -540,7 +539,7 @@
uint64_t packet_number) {
return client_maker_.MakeAckAndRstPacket(
packet_number, !kIncludeVersion, stream_id_,
- quic::QUIC_STREAM_CANCELLED, 2, 1, 2, !kIncludeCongestionFeedback);
+ quic::QUIC_STREAM_CANCELLED, 2, 1, 2);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructClientAckPacket(
@@ -549,8 +548,7 @@
uint64_t smallest_received,
uint64_t least_unacked) {
return client_maker_.MakeAckPacket(packet_number, largest_received,
- smallest_received, least_unacked,
- !kIncludeCongestionFeedback);
+ smallest_received, least_unacked);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructServerAckPacket(
@@ -559,8 +557,7 @@
uint64_t smallest_received,
uint64_t least_unacked) {
return server_maker_.MakeAckPacket(packet_number, largest_received,
- smallest_received, least_unacked,
- !kIncludeCongestionFeedback);
+ smallest_received, least_unacked);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructInitialSettingsPacket() {
@@ -1632,7 +1629,6 @@
packet_number++,
/* include_version = */ false, stream_id_,
quic::QUIC_RST_ACKNOWLEDGEMENT, 4, 1, 1,
- /* send_feedback = */ false,
/* include_stop_sending_if_v99 = */ false));
}
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index c789246..5d3378b 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -368,7 +368,7 @@
uint64_t smallest_received,
uint64_t least_unacked) {
return client_maker_->MakeAckPacket(packet_number, largest_received,
- smallest_received, least_unacked, true);
+ smallest_received, least_unacked);
}
std::unique_ptr<quic::QuicEncryptedPacket> ConstructClientAckAndRstPacket(
@@ -378,9 +378,9 @@
uint64_t largest_received,
uint64_t smallest_received,
uint64_t least_unacked) {
- return client_maker_->MakeAckAndRstPacket(
- num, false, stream_id, error_code, largest_received, smallest_received,
- least_unacked, true);
+ return client_maker_->MakeAckAndRstPacket(num, false, stream_id, error_code,
+ largest_received,
+ smallest_received, least_unacked);
}
std::unique_ptr<quic::QuicEncryptedPacket> ConstructClientRstPacket(
@@ -397,7 +397,7 @@
uint64_t smallest_received,
uint64_t least_unacked) {
return client_maker_->MakeAckPacket(packet_number, largest_received,
- smallest_received, least_unacked, true);
+ smallest_received, least_unacked);
}
std::unique_ptr<quic::QuicEncryptedPacket>
@@ -434,7 +434,7 @@
uint64_t smallest_received,
uint64_t least_unacked) {
return server_maker_.MakeAckPacket(packet_number, largest_received,
- smallest_received, least_unacked, false);
+ smallest_received, least_unacked);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructClientPriorityPacket(
@@ -7614,7 +7614,7 @@
uint64_t least_unacked,
QuicTestPacketMaker* maker) {
return maker->MakeAckPacket(packet_number, largest_received,
- smallest_received, least_unacked, true);
+ smallest_received, least_unacked);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructInitialSettingsPacket(
@@ -9268,8 +9268,8 @@
}
server_data_offset += 10;
- mock_quic_data.AddWrite(
- SYNCHRONOUS, client_maker.MakeAckPacket(packet_num++, 2, 1, 1, true));
+ mock_quic_data.AddWrite(SYNCHRONOUS,
+ client_maker.MakeAckPacket(packet_num++, 2, 1, 1));
if (VersionUsesHttp3(version_.transport_version)) {
mock_quic_data.AddWrite(
@@ -9337,7 +9337,7 @@
client_maker.MakeAckAndRstPacket(
packet_num++, false,
GetNthClientInitiatedBidirectionalStreamId(1),
- quic::QUIC_STREAM_CANCELLED, 3, 3, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 3, 3, 1));
}
mock_quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -9769,8 +9769,7 @@
2, GetNthClientInitiatedBidirectionalStreamId(0), false,
true, ConstructDataHeader(1) + "1"));
partitioned_mock_quic_data1.AddWrite(
- SYNCHRONOUS,
- client_maker2.MakeAckPacket(packet_num2++, 2, 1, 1, true));
+ SYNCHRONOUS, client_maker2.MakeAckPacket(packet_num2++, 2, 1, 1));
partitioned_mock_quic_data1.AddWrite(
SYNCHRONOUS,
@@ -9788,8 +9787,7 @@
4, GetNthClientInitiatedBidirectionalStreamId(1), false,
true, ConstructDataHeader(1) + "3"));
partitioned_mock_quic_data1.AddWrite(
- SYNCHRONOUS,
- client_maker2.MakeAckPacket(packet_num2++, 4, 3, 1, true));
+ SYNCHRONOUS, client_maker2.MakeAckPacket(packet_num2++, 4, 3, 1));
partitioned_mock_quic_data1.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
@@ -9831,8 +9829,7 @@
2, GetNthClientInitiatedBidirectionalStreamId(0), false,
true, ConstructDataHeader(1) + "2"));
partitioned_mock_quic_data2.AddWrite(
- SYNCHRONOUS,
- client_maker3.MakeAckPacket(packet_num3++, 2, 1, 1, true));
+ SYNCHRONOUS, client_maker3.MakeAckPacket(packet_num3++, 2, 1, 1));
partitioned_mock_quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
@@ -9989,7 +9986,7 @@
3, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
ConstructDataHeader(10) + std::string("0123456789")));
mock_quic_data[index]->AddWrite(
- SYNCHRONOUS, client_maker.MakeAckPacket(packet_num++, 3, 2, 1, true));
+ SYNCHRONOUS, client_maker.MakeAckPacket(packet_num++, 3, 2, 1));
mock_quic_data[index]->AddRead(SYNCHRONOUS,
ERR_IO_PENDING); // No more data to read
diff --git a/net/quic/quic_proxy_client_socket_unittest.cc b/net/quic/quic_proxy_client_socket_unittest.cc
index 8fc4d25..045cfeec 100644
--- a/net/quic/quic_proxy_client_socket_unittest.cc
+++ b/net/quic/quic_proxy_client_socket_unittest.cc
@@ -115,8 +115,6 @@
static const bool kFin = true;
static const bool kIncludeVersion = true;
static const bool kIncludeDiversificationNonce = true;
- static const bool kIncludeCongestionFeedback = true;
- static const bool kSendFeedback = true;
static size_t GetStreamFrameDataLengthFromPacketLength(
quic::QuicByteCount packet_length,
@@ -340,7 +338,7 @@
uint64_t least_unacked) {
return client_maker_.MakeAckAndRstPacket(
packet_number, !kIncludeVersion, client_data_stream_id1_, error_code,
- largest_received, smallest_received, least_unacked, kSendFeedback,
+ largest_received, smallest_received, least_unacked,
/*include_stop_sending=*/false);
}
@@ -352,7 +350,7 @@
uint64_t least_unacked) {
return client_maker_.MakeAckAndRstPacket(
packet_number, !kIncludeVersion, client_data_stream_id1_, error_code,
- largest_received, smallest_received, least_unacked, kSendFeedback,
+ largest_received, smallest_received, least_unacked,
/*include_stop_sending_if_v99=*/true);
}
@@ -437,8 +435,7 @@
uint64_t smallest_received,
uint64_t least_unacked) {
return client_maker_.MakeAckPacket(packet_number, largest_received,
- smallest_received, least_unacked,
- kSendFeedback);
+ smallest_received, least_unacked);
}
// Helper functions for constructing packets sent by the server
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index 46cf6306..9f277f2d 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -2709,7 +2709,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 2, 2, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 2, 2, 1));
}
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -2905,7 +2905,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 2, 2, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 2, 2, 1));
}
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -3785,7 +3785,7 @@
client_maker_.MakeAckAndRstPacket(
packet_number++, false,
GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -3929,7 +3929,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -4024,8 +4024,8 @@
server_maker_.MakeConnectivityProbingPacket(3, false));
quic_data2.AddRead(SYNCHRONOUS,
server_maker_.MakeConnectivityProbingPacket(4, false));
- quic_data2.AddWrite(
- ASYNC, client_maker_.MakeAckPacket(packet_number++, 1, 4, 1, 1, true));
+ quic_data2.AddWrite(ASYNC,
+ client_maker_.MakeAckPacket(packet_number++, 1, 4, 1, 1));
quic_data2.AddRead(
ASYNC,
ConstructOkResponsePacket(
@@ -4047,7 +4047,7 @@
client_maker_.MakeAckAndRstPacket(
packet_number++, false,
GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 5, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 5, 1, 1));
}
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -4236,7 +4236,7 @@
client_maker_.MakeAckAndRstPacket(
packet_number++, false,
GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 2, 2, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 2, 2, 1));
}
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -4456,7 +4456,7 @@
client_maker_.MakeAckAndRstPacket(
packet_number++, false,
GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 2, 2, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 2, 2, 1));
}
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -4637,7 +4637,7 @@
// ACK and PING post migration after successful probing.
quic_data2.AddWrite(
SYNCHRONOUS, client_maker_.MakeAckPacket(packet_number++, 1 + 2 * i,
- 1 + 2 * i, 1, true));
+ 1 + 2 * i, 1));
quic_data2.AddWrite(SYNCHRONOUS,
client_maker_.MakePingPacket(packet_number++, false));
}
@@ -4659,8 +4659,8 @@
// response.
quic_data2.AddRead(ASYNC, server_maker_.MakeConnectivityProbingPacket(
server_packet_num++, false));
- quic_data2.AddWrite(SYNCHRONOUS, client_maker_.MakeAckPacket(
- packet_number++, 9, 9, 1, true));
+ quic_data2.AddWrite(
+ SYNCHRONOUS, client_maker_.MakeAckPacket(packet_number++, 9, 9, 1));
}
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING); // EOF.
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -4881,7 +4881,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
quic_data.AddSocketDataToFactory(socket_factory_.get());
@@ -5014,9 +5014,8 @@
quic_data2.AddRead(ASYNC,
server_maker_.MakeConnectivityProbingPacket(3, false));
// Ping packet to send after migration is completed.
- quic_data2.AddWrite(
- write_mode_for_queued_packet,
- client_maker_.MakeAckPacket(packet_number++, 2, 3, 3, 1, true));
+ quic_data2.AddWrite(write_mode_for_queued_packet,
+ client_maker_.MakeAckPacket(packet_number++, 2, 3, 3, 1));
if (write_mode_for_queued_packet == SYNCHRONOUS) {
quic_data2.AddWrite(ASYNC,
client_maker_.MakePingPacket(packet_number++, false));
@@ -5026,8 +5025,8 @@
ASYNC,
ConstructOkResponsePacket(
1, GetNthClientInitiatedBidirectionalStreamId(0), false, false));
- quic_data2.AddWrite(SYNCHRONOUS, client_maker_.MakeAckPacket(
- packet_number++, 1, 3, 1, 1, true));
+ quic_data2.AddWrite(SYNCHRONOUS,
+ client_maker_.MakeAckPacket(packet_number++, 1, 3, 1, 1));
quic_data2.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -5202,7 +5201,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 2, 2, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 2, 2, 1));
}
quic_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -5489,7 +5488,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
quic_data.AddSocketDataToFactory(socket_factory_.get());
@@ -5845,7 +5844,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
if (VersionUsesHttp3(version_.transport_version)) {
socket_data1.AddWrite(
@@ -6075,8 +6074,8 @@
quic_data3.AddRead(ASYNC,
server_maker_.MakeConnectivityProbingPacket(2, false));
quic_data3.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- quic_data3.AddWrite(
- ASYNC, client_maker_.MakeAckPacket(packet_num++, 1, 2, 1, 1, true));
+ quic_data3.AddWrite(ASYNC,
+ client_maker_.MakeAckPacket(packet_num++, 1, 2, 1, 1));
if (VersionUsesHttp3(version_.transport_version)) {
quic_data3.AddWrite(
SYNCHRONOUS, client_maker_.MakeDataPacket(
@@ -6329,7 +6328,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -6569,7 +6568,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -6703,7 +6702,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -6905,7 +6904,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
if (VersionUsesHttp3(version_.transport_version)) {
@@ -7080,7 +7079,7 @@
client_maker_.MakeAckAndRstPacket(
packet_number++, false,
GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -7251,7 +7250,7 @@
client_maker_.MakeAckAndRstPacket(
packet_number++, false,
GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -7633,7 +7632,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data2.AddSocketDataToFactory(socket_factory_.get());
@@ -7832,7 +7831,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -7984,7 +7983,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -8153,7 +8152,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -8292,7 +8291,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -8420,7 +8419,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -8553,7 +8552,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -8652,10 +8651,9 @@
base::StringPiece("Hello World")));
// Read an ACK from server which acks all client data.
- socket_data1.AddRead(SYNCHRONOUS,
- server_maker_.MakeAckPacket(3, 3, 1, 1, false));
- socket_data1.AddWrite(
- ASYNC, client_maker_.MakeAckPacket(packet_num++, 2, 1, 1, false));
+ socket_data1.AddRead(SYNCHRONOUS, server_maker_.MakeAckPacket(3, 3, 1, 1));
+ socket_data1.AddWrite(ASYNC,
+ client_maker_.MakeAckPacket(packet_num++, 2, 1, 1));
// The PING packet sent for retransmittable on wire.
socket_data1.AddWrite(SYNCHRONOUS,
client_maker_.MakePingPacket(packet_num++, false));
@@ -8814,10 +8812,9 @@
2, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
base::StringPiece("Hello World")));
// Read an ACK from server which acks all client data.
- socket_data1.AddRead(SYNCHRONOUS,
- server_maker_.MakeAckPacket(3, 3, 1, 1, false));
- socket_data1.AddWrite(
- ASYNC, client_maker_.MakeAckPacket(packet_num++, 2, 1, 1, false));
+ socket_data1.AddRead(SYNCHRONOUS, server_maker_.MakeAckPacket(3, 3, 1, 1));
+ socket_data1.AddWrite(ASYNC,
+ client_maker_.MakeAckPacket(packet_num++, 2, 1, 1));
// The PING packet sent for retransmittable on wire.
socket_data1.AddWrite(SYNCHRONOUS,
client_maker_.MakePingPacket(packet_num++, false));
@@ -8964,10 +8961,9 @@
2, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
base::StringPiece("Hello World")));
// Read an ACK from server which acks all client data.
- socket_data1.AddRead(SYNCHRONOUS,
- server_maker_.MakeAckPacket(3, 2, 1, 1, false));
- socket_data1.AddWrite(
- ASYNC, client_maker_.MakeAckPacket(packet_num++, 2, 1, 1, false));
+ socket_data1.AddRead(SYNCHRONOUS, server_maker_.MakeAckPacket(3, 2, 1, 1));
+ socket_data1.AddWrite(ASYNC,
+ client_maker_.MakeAckPacket(packet_num++, 2, 1, 1));
// The PING packet sent for retransmittable on wire.
socket_data1.AddWrite(SYNCHRONOUS,
client_maker_.MakePingPacket(packet_num++, false));
@@ -9112,10 +9108,9 @@
2, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
base::StringPiece("Hello World")));
// Read an ACK from server which acks all client data.
- socket_data1.AddRead(SYNCHRONOUS,
- server_maker_.MakeAckPacket(3, 2, 1, 1, false));
- socket_data1.AddWrite(
- ASYNC, client_maker_.MakeAckPacket(packet_num++, 2, 1, 1, false));
+ socket_data1.AddRead(SYNCHRONOUS, server_maker_.MakeAckPacket(3, 2, 1, 1));
+ socket_data1.AddWrite(ASYNC,
+ client_maker_.MakeAckPacket(packet_num++, 2, 1, 1));
std::string header = ConstructDataHeader(6);
socket_data1.AddRead(
ASYNC, ConstructServerDataPacket(
@@ -9251,10 +9246,9 @@
2, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
base::StringPiece("Hello World")));
// Read an ACK from server which acks all client data.
- socket_data1.AddRead(SYNCHRONOUS,
- server_maker_.MakeAckPacket(3, 2, 1, 1, false));
- socket_data1.AddWrite(
- ASYNC, client_maker_.MakeAckPacket(packet_num++, 2, 1, 1, false));
+ socket_data1.AddRead(SYNCHRONOUS, server_maker_.MakeAckPacket(3, 2, 1, 1));
+ socket_data1.AddWrite(ASYNC,
+ client_maker_.MakeAckPacket(packet_num++, 2, 1, 1));
// The PING packet sent for retransmittable on wire.
socket_data1.AddWrite(SYNCHRONOUS,
client_maker_.MakePingPacket(packet_num++, false));
@@ -9401,10 +9395,9 @@
2, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
base::StringPiece("Hello World")));
// Read an ACK from server which acks all client data.
- socket_data1.AddRead(SYNCHRONOUS,
- server_maker_.MakeAckPacket(3, 2, 1, 1, false));
- socket_data1.AddWrite(
- ASYNC, client_maker_.MakeAckPacket(packet_num++, 2, 1, 1, false));
+ socket_data1.AddRead(SYNCHRONOUS, server_maker_.MakeAckPacket(3, 2, 1, 1));
+ socket_data1.AddWrite(ASYNC,
+ client_maker_.MakeAckPacket(packet_num++, 2, 1, 1));
std::string header = ConstructDataHeader(6);
socket_data1.AddRead(
ASYNC, ConstructServerDataPacket(
@@ -9745,7 +9738,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -10140,7 +10133,7 @@
SYNCHRONOUS,
client_maker_.MakeAckAndRstPacket(
packet_num++, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 1, 1, 1, true));
+ quic::QUIC_STREAM_CANCELLED, 1, 1, 1));
}
socket_data2.AddSocketDataToFactory(socket_factory_.get());
diff --git a/net/quic/quic_test_packet_maker.cc b/net/quic/quic_test_packet_maker.cc
index 49a7e433..db63151a 100644
--- a/net/quic/quic_test_packet_maker.cc
+++ b/net/quic/quic_test_packet_maker.cc
@@ -306,11 +306,9 @@
quic::QuicRstStreamErrorCode error_code,
uint64_t largest_received,
uint64_t smallest_received,
- uint64_t least_unacked,
- bool send_feedback) {
+ uint64_t least_unacked) {
return MakeAckAndRstPacket(num, include_version, stream_id, error_code,
largest_received, smallest_received, least_unacked,
- send_feedback,
/*include_stop_sending_if_v99=*/true);
}
@@ -323,7 +321,6 @@
uint64_t largest_received,
uint64_t smallest_received,
uint64_t least_unacked,
- bool send_feedback,
bool include_stop_sending_if_v99) {
InitializeHeader(num, include_version);
@@ -479,10 +476,9 @@
uint64_t packet_number,
uint64_t largest_received,
uint64_t smallest_received,
- uint64_t least_unacked,
- bool send_feedback) {
+ uint64_t least_unacked) {
return MakeAckPacket(packet_number, 1, largest_received, smallest_received,
- least_unacked, send_feedback);
+ least_unacked);
}
std::unique_ptr<quic::QuicReceivedPacket> QuicTestPacketMaker::MakeAckPacket(
@@ -490,8 +486,7 @@
uint64_t first_received,
uint64_t largest_received,
uint64_t smallest_received,
- uint64_t least_unacked,
- bool send_feedback) {
+ uint64_t least_unacked) {
InitializeHeader(packet_number, /*include_version=*/false);
AddQuicAckFrame(first_received, largest_received, smallest_received);
return BuildPacket();
diff --git a/net/quic/quic_test_packet_maker.h b/net/quic/quic_test_packet_maker.h
index f153bbb..8df27cfb 100644
--- a/net/quic/quic_test_packet_maker.h
+++ b/net/quic/quic_test_packet_maker.h
@@ -123,8 +123,7 @@
quic::QuicRstStreamErrorCode error_code,
uint64_t largest_received,
uint64_t smallest_received,
- uint64_t least_unacked,
- bool send_feedback);
+ uint64_t least_unacked);
std::unique_ptr<quic::QuicReceivedPacket> MakeAckAndRstPacket(
uint64_t num,
@@ -134,7 +133,6 @@
uint64_t largest_received,
uint64_t smallest_received,
uint64_t least_unacked,
- bool send_feedback,
bool include_stop_sending_if_v99);
std::unique_ptr<quic::QuicReceivedPacket> MakeRstAckAndConnectionClosePacket(
@@ -205,16 +203,14 @@
uint64_t packet_number,
uint64_t largest_received,
uint64_t smallest_received,
- uint64_t least_unacked,
- bool send_feedback);
+ uint64_t least_unacked);
std::unique_ptr<quic::QuicReceivedPacket> MakeAckPacket(
uint64_t packet_number,
uint64_t first_received,
uint64_t largest_received,
uint64_t smallest_received,
- uint64_t least_unacked,
- bool send_feedback);
+ uint64_t least_unacked);
std::unique_ptr<quic::QuicReceivedPacket> MakeDataPacket(
uint64_t packet_number,
