Move more stream offset tracking into the QuicTestPacketMaker
to simplify callers and facilitate support for v99.
Change-Id: I8eb5f2045b0cd9d1c847fb992378a30182a3619d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1671013
Commit-Queue: Ryan Hamilton <[email protected]>
Reviewed-by: Bence Béky <[email protected]>
Cr-Commit-Position: refs/heads/master@{#671425}
diff --git a/net/quic/bidirectional_stream_quic_impl_unittest.cc b/net/quic/bidirectional_stream_quic_impl_unittest.cc
index d2d046b..b6946b30 100644
--- a/net/quic/bidirectional_stream_quic_impl_unittest.cc
+++ b/net/quic/bidirectional_stream_quic_impl_unittest.cc
@@ -676,31 +676,29 @@
std::unique_ptr<quic::QuicReceivedPacket> ConstructClientRstStreamPacket(
uint64_t packet_number) {
- return ConstructRstStreamCancelledPacket(packet_number, !kIncludeVersion, 0,
+ return ConstructRstStreamCancelledPacket(packet_number, !kIncludeVersion,
&client_maker_);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructServerRstStreamPacket(
uint64_t packet_number) {
- return ConstructRstStreamCancelledPacket(packet_number, !kIncludeVersion, 0,
+ return ConstructRstStreamCancelledPacket(packet_number, !kIncludeVersion,
&server_maker_);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructClientEarlyRstStreamPacket(
uint64_t packet_number) {
- return ConstructRstStreamCancelledPacket(packet_number, kIncludeVersion, 0,
+ return ConstructRstStreamCancelledPacket(packet_number, kIncludeVersion,
&client_maker_);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructRstStreamCancelledPacket(
uint64_t packet_number,
bool include_version,
- size_t bytes_written,
QuicTestPacketMaker* maker) {
- std::unique_ptr<quic::QuicReceivedPacket> packet(
- maker->MakeRstPacket(packet_number, include_version, stream_id_,
- quic::QUIC_STREAM_CANCELLED, bytes_written,
- /*include_stop_sending_if_v99=*/true));
+ std::unique_ptr<quic::QuicReceivedPacket> packet(maker->MakeRstPacket(
+ packet_number, include_version, stream_id_, quic::QUIC_STREAM_CANCELLED,
+ /*include_stop_sending_if_v99=*/true));
DVLOG(2) << "packet(" << packet_number << "): " << std::endl
<< quic::QuicTextUtils::HexDump(packet->AsStringPiece());
return packet;
diff --git a/net/quic/quic_chromium_client_session_test.cc b/net/quic/quic_chromium_client_session_test.cc
index 744f462..6c172d84 100644
--- a/net/quic/quic_chromium_client_session_test.cc
+++ b/net/quic/quic_chromium_client_session_test.cc
@@ -518,7 +518,7 @@
quic_data.AddWrite(
SYNCHRONOUS, client_maker_.MakeRstPacket(
3, true, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 0,
+ quic::QUIC_STREAM_CANCELLED,
/*include_stop_sending_if_v99=*/false));
// After the STREAMS_BLOCKED is sent, receive a MAX_STREAMS to increase
// the limit to 53.
@@ -657,7 +657,7 @@
quic_data.AddWrite(
SYNCHRONOUS, client_maker_.MakeRstPacket(
3, true, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 0,
+ quic::QUIC_STREAM_CANCELLED,
/*include_stop_sending_if_v99=*/false));
} else {
quic_data.AddWrite(
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index f70c2c1..a87d451 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -466,14 +466,13 @@
RequestPriority request_priority,
quic::QuicStreamId parent_stream_id,
size_t* spdy_headers_frame_length,
- quic::QuicRstStreamErrorCode error_code,
- size_t bytes_written) {
+ quic::QuicRstStreamErrorCode error_code) {
spdy::SpdyPriority priority =
ConvertRequestPriorityToQuicPriority(request_priority);
return client_maker_.MakeRequestHeadersAndRstPacket(
packet_number, stream_id, should_include_version, fin, priority,
std::move(request_headers_), parent_stream_id,
- spdy_headers_frame_length, error_code, bytes_written);
+ spdy_headers_frame_length, error_code);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructRequestHeadersPacket(
@@ -2373,7 +2372,7 @@
AddWrite(ConstructRequestAndRstPacket(
2, GetNthClientInitiatedBidirectionalStreamId(0), kIncludeVersion, !kFin,
DEFAULT_PRIORITY, 0, &spdy_request_headers_frame_length,
- quic::QUIC_ERROR_PROCESSING_STREAM, 0));
+ quic::QUIC_ERROR_PROCESSING_STREAM));
Initialize();
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index 8afec5b..c589f5f5 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -371,10 +371,8 @@
std::unique_ptr<quic::QuicEncryptedPacket> ConstructClientRstPacket(
uint64_t num,
quic::QuicStreamId stream_id,
- quic::QuicRstStreamErrorCode error_code,
- size_t bytes_written) {
+ quic::QuicRstStreamErrorCode error_code) {
return client_maker_.MakeRstPacket(num, false, stream_id, error_code,
- bytes_written,
/*include_stop_sending_if_v99=*/true);
}
@@ -7000,7 +6998,7 @@
mock_quic_data.AddWrite(SYNCHRONOUS,
ConstructClientRstPacket(
3, GetNthServerInitiatedUnidirectionalStreamId(0),
- quic::QUIC_INVALID_PROMISE_URL, 0));
+ quic::QUIC_INVALID_PROMISE_URL));
mock_quic_data.AddRead(
ASYNC, ConstructServerResponseHeadersPacket(
@@ -7092,8 +7090,7 @@
mock_quic_data.AddWrite(
SYNCHRONOUS,
ConstructClientRstPacket(5, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED,
- strlen(get_request) + header.length()));
+ quic::QUIC_STREAM_CANCELLED));
mock_quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -7183,8 +7180,7 @@
mock_quic_data.AddWrite(
SYNCHRONOUS,
ConstructClientRstPacket(5, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED,
- get_frame.size() + header.length()));
+ quic::QUIC_STREAM_CANCELLED));
mock_quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -7239,7 +7235,6 @@
1, GetNthClientInitiatedBidirectionalStreamId(0), false, false,
GetResponseHeaders("200 OK")));
- quic::QuicStreamOffset client_data_offset = 0;
quic::QuicStreamOffset server_data_offset = 0;
const char get_request_1[] =
"GET / HTTP/1.1\r\n"
@@ -7260,8 +7255,6 @@
false, {header, std::string(get_request_1)}));
}
- client_data_offset += strlen(get_request_1) + header.length();
-
const char get_response_1[] =
"HTTP/1.1 200 OK\r\n"
"Content-Length: 10\r\n\r\n";
@@ -7293,14 +7286,12 @@
ConstructClientMultipleDataFramesPacket(
write_packet_index++, GetNthClientInitiatedBidirectionalStreamId(0),
false, false, {header4, std::string(get_request_2)}));
- client_data_offset += header4.length() + strlen(get_request_2);
} else {
mock_quic_data.AddWrite(
SYNCHRONOUS,
ConstructClientDataPacket(
write_packet_index++, GetNthClientInitiatedBidirectionalStreamId(0),
false, false, quic::QuicStringPiece(get_request_2)));
- client_data_offset += strlen(get_request_2);
}
const char get_response_2[] =
@@ -7326,9 +7317,9 @@
mock_quic_data.AddWrite(
SYNCHRONOUS,
- ConstructClientRstPacket(
- write_packet_index++, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, client_data_offset));
+ ConstructClientRstPacket(write_packet_index++,
+ GetNthClientInitiatedBidirectionalStreamId(0),
+ quic::QUIC_STREAM_CANCELLED));
mock_quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -7482,13 +7473,11 @@
mock_quic_data.AddWrite(
SYNCHRONOUS,
ConstructClientRstPacket(8, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED,
- strlen(get_request) + header.length()));
+ quic::QUIC_STREAM_CANCELLED));
mock_quic_data.AddWrite(
SYNCHRONOUS,
ConstructClientRstPacket(9, GetNthClientInitiatedBidirectionalStreamId(1),
- quic::QUIC_STREAM_CANCELLED,
- get_frame.size() + header4.length()));
+ quic::QUIC_STREAM_CANCELLED));
mock_quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -7689,8 +7678,7 @@
mock_quic_data.AddWrite(
SYNCHRONOUS,
ConstructClientRstPacket(7, GetNthClientInitiatedBidirectionalStreamId(1),
- quic::QUIC_STREAM_CANCELLED,
- strlen(get_request) + header.length()));
+ quic::QUIC_STREAM_CANCELLED));
mock_quic_data.AddSocketDataToFactory(&socket_factory_);
@@ -7908,7 +7896,6 @@
"QUIC proxy.example.org:70", TRAFFIC_ANNOTATION_FOR_TESTS);
MockQuicData mock_quic_data(version_);
- quic::QuicStreamOffset client_data_offset = 0;
quic::QuicStreamOffset server_data_offset = 0;
mock_quic_data.AddWrite(SYNCHRONOUS,
@@ -7952,7 +7939,7 @@
SYNCHRONOUS,
client_maker->MakeRstPacket(
4, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, client_data_offset,
+ quic::QUIC_STREAM_CANCELLED,
/*include_stop_sending_if_v99=*/true));
headers = client_maker->ConnectRequestHeaders("mail.example.org:443");
diff --git a/net/quic/quic_proxy_client_socket_unittest.cc b/net/quic/quic_proxy_client_socket_unittest.cc
index 6e5dcf1..d01fb382 100644
--- a/net/quic/quic_proxy_client_socket_unittest.cc
+++ b/net/quic/quic_proxy_client_socket_unittest.cc
@@ -280,7 +280,7 @@
return client_maker_.MakeInitialSettingsPacket(packet_number);
}
- std::unique_ptr<quic::QuicReceivedPacket> ConstructAckAndRstPacket(
+ std::unique_ptr<quic::QuicReceivedPacket> ConstructAckAndRstOnlyPacket(
uint64_t packet_number,
quic::QuicRstStreamErrorCode error_code,
uint64_t largest_received,
@@ -288,20 +288,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);
- }
-
- std::unique_ptr<quic::QuicReceivedPacket> ConstructAckAndRstOnlyPacket(
- uint64_t packet_number,
- quic::QuicRstStreamErrorCode error_code,
- uint64_t largest_received,
- uint64_t smallest_received,
- uint64_t least_unacked,
- size_t bytes_written) {
- return client_maker_.MakeAckAndRstPacket(
- packet_number, !kIncludeVersion, client_data_stream_id1_, error_code,
largest_received, smallest_received, least_unacked, kSendFeedback,
- bytes_written,
/*include_stop_sending=*/false);
}
@@ -310,22 +297,18 @@
quic::QuicRstStreamErrorCode error_code,
uint64_t largest_received,
uint64_t smallest_received,
- uint64_t least_unacked,
- size_t bytes_written) {
+ uint64_t least_unacked) {
return client_maker_.MakeAckAndRstPacket(
packet_number, !kIncludeVersion, client_data_stream_id1_, error_code,
largest_received, smallest_received, least_unacked, kSendFeedback,
- bytes_written,
/*include_stop_sending_if_v99=*/true);
}
std::unique_ptr<quic::QuicReceivedPacket> ConstructRstPacket(
uint64_t packet_number,
- quic::QuicRstStreamErrorCode error_code,
- size_t bytes_written) {
+ quic::QuicRstStreamErrorCode error_code) {
return client_maker_.MakeRstPacket(packet_number, !kIncludeVersion,
client_data_stream_id1_, error_code,
- bytes_written,
/*include_stop_sending_if_v99=*/true);
}
@@ -403,11 +386,9 @@
std::unique_ptr<quic::QuicReceivedPacket> ConstructServerRstPacket(
uint64_t packet_number,
- quic::QuicRstStreamErrorCode error_code,
- size_t bytes_written) {
+ quic::QuicRstStreamErrorCode error_code) {
return server_maker_.MakeRstPacket(packet_number, !kIncludeVersion,
client_data_stream_id1_, error_code,
- bytes_written,
/*include_stop_sending_if_v99=*/true);
}
@@ -758,8 +739,8 @@
ASYNC, ConstructServerDataPacket(2, header + std::string(kMsg1, kLen1)));
mock_quic_data_.AddWrite(SYNCHRONOUS, ConstructAckPacket(3, 2, 1, 1));
mock_quic_data_.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED, 0));
+ mock_quic_data_.AddWrite(SYNCHRONOUS,
+ ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED));
Initialize();
@@ -791,8 +772,8 @@
ConstructServerDataPacket(2, header + std::string(kMsg333, kLen333)));
mock_quic_data_.AddWrite(SYNCHRONOUS, ConstructAckPacket(3, 2, 1, 1));
mock_quic_data_.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED, 0));
+ mock_quic_data_.AddWrite(SYNCHRONOUS,
+ ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED));
Initialize();
@@ -853,9 +834,7 @@
ConstructMultipleDataFramesPacket(
4, {header2, std::string(kMsg2, kLen2)}));
mock_quic_data_.AddWrite(
- SYNCHRONOUS,
- ConstructRstPacket(5, quic::QUIC_STREAM_CANCELLED,
- kLen1 + kLen2 + header.length() + header2.length()));
+ SYNCHRONOUS, ConstructRstPacket(5, quic::QUIC_STREAM_CANCELLED));
} else {
mock_quic_data_.AddWrite(
SYNCHRONOUS,
@@ -863,8 +842,7 @@
mock_quic_data_.AddWrite(SYNCHRONOUS,
ConstructDataPacket(4, std::string(kMsg2, kLen2)));
mock_quic_data_.AddWrite(
- SYNCHRONOUS,
- ConstructRstPacket(5, quic::QUIC_STREAM_CANCELLED, kLen1 + kLen2));
+ SYNCHRONOUS, ConstructRstPacket(5, quic::QUIC_STREAM_CANCELLED));
}
Initialize();
@@ -938,8 +916,8 @@
}
mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructRstPacket(write_packet_index++,
- quic::QUIC_STREAM_CANCELLED, offset));
+ SYNCHRONOUS,
+ ConstructRstPacket(write_packet_index++, quic::QUIC_STREAM_CANCELLED));
Initialize();
@@ -968,8 +946,8 @@
ASYNC, ConstructServerDataPacket(2, header + std::string(kMsg1, kLen1)));
mock_quic_data_.AddWrite(SYNCHRONOUS, ConstructAckPacket(3, 2, 1, 1));
mock_quic_data_.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED, 0));
+ mock_quic_data_.AddWrite(SYNCHRONOUS,
+ ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED));
Initialize();
@@ -1164,8 +1142,8 @@
mock_quic_data_.AddWrite(SYNCHRONOUS, ConstructAckPacket(3, 2, 1, 1));
mock_quic_data_.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED, 0));
+ mock_quic_data_.AddWrite(SYNCHRONOUS,
+ ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED));
Initialize();
@@ -1278,9 +1256,9 @@
mock_quic_data_.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructAckAndRstPacket(write_packet_index++,
- quic::QUIC_STREAM_CANCELLED, 3, 3,
- 1, kLen2 + header2.length()));
+ SYNCHRONOUS,
+ ConstructAckAndRstPacket(write_packet_index++,
+ quic::QUIC_STREAM_CANCELLED, 3, 3, 1));
Initialize();
@@ -1337,9 +1315,8 @@
header3 + std::string(kMsg2, kLen2)));
}
- mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructRstPacket(6, quic::QUIC_STREAM_CANCELLED,
- kLen2 + kLen2 + 2 * header3.length()));
+ mock_quic_data_.AddWrite(SYNCHRONOUS,
+ ConstructRstPacket(6, quic::QUIC_STREAM_CANCELLED));
Initialize();
@@ -1442,8 +1419,8 @@
2, header + std::string(kMsg1, kLen1)));
mock_quic_data_.AddWrite(SYNCHRONOUS, ConstructAckPacket(3, 2, 1, 1));
mock_quic_data_.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED, 0));
+ mock_quic_data_.AddWrite(SYNCHRONOUS,
+ ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED));
Initialize();
@@ -1600,22 +1577,22 @@
mock_quic_data_.AddRead(ASYNC, ERR_IO_PENDING); // Pause
mock_quic_data_.AddRead(
- ASYNC, ConstructServerRstPacket(2, quic::QUIC_STREAM_CANCELLED, 0));
+ ASYNC, ConstructServerRstPacket(2, quic::QUIC_STREAM_CANCELLED));
mock_quic_data_.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
std::string header = ConstructDataHeader(kLen2);
if (version_.transport_version != quic::QUIC_VERSION_99) {
mock_quic_data_.AddWrite(ASYNC, ConstructAckAndDataPacket(
3, 1, 1, 1, std::string(kMsg2, kLen2)));
mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructAckAndRstPacket(4, quic::QUIC_RST_ACKNOWLEDGEMENT,
- 2, 2, 1, kLen2));
+ SYNCHRONOUS,
+ ConstructAckAndRstPacket(4, quic::QUIC_RST_ACKNOWLEDGEMENT, 2, 2, 1));
} else {
mock_quic_data_.AddWrite(
ASYNC, ConstructAckAndMultipleDataFramesPacket(
3, 1, 1, 1, {header, std::string(kMsg2, kLen2)}));
- mock_quic_data_.AddWrite(SYNCHRONOUS, ConstructAckAndRstOnlyPacket(
- 4, quic::QUIC_STREAM_CANCELLED, 2,
- 2, 1, header.length() + kLen2));
+ mock_quic_data_.AddWrite(
+ SYNCHRONOUS,
+ ConstructAckAndRstOnlyPacket(4, quic::QUIC_STREAM_CANCELLED, 2, 2, 1));
}
Initialize();
@@ -1654,8 +1631,8 @@
ASYNC, ConstructServerDataPacket(2, header + std::string(kMsg1, kLen1)));
mock_quic_data_.AddWrite(SYNCHRONOUS, ConstructAckPacket(3, 2, 1, 1));
mock_quic_data_.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
- mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED, 0));
+ mock_quic_data_.AddWrite(SYNCHRONOUS,
+ ConstructRstPacket(4, quic::QUIC_STREAM_CANCELLED));
Initialize();
@@ -1732,22 +1709,22 @@
mock_quic_data_.AddRead(ASYNC, ERR_IO_PENDING); // Pause
mock_quic_data_.AddRead(
- ASYNC, ConstructServerRstPacket(2, quic::QUIC_STREAM_CANCELLED, 0));
+ ASYNC, ConstructServerRstPacket(2, quic::QUIC_STREAM_CANCELLED));
mock_quic_data_.AddRead(SYNCHRONOUS, ERR_IO_PENDING);
if (version_.transport_version != quic::QUIC_VERSION_99) {
mock_quic_data_.AddWrite(ASYNC, ConstructAckAndDataPacket(
3, 1, 1, 1, std::string(kMsg1, kLen1)));
mock_quic_data_.AddWrite(
- SYNCHRONOUS, ConstructAckAndRstPacket(4, quic::QUIC_RST_ACKNOWLEDGEMENT,
- 2, 2, 1, kLen1));
+ SYNCHRONOUS,
+ ConstructAckAndRstPacket(4, quic::QUIC_RST_ACKNOWLEDGEMENT, 2, 2, 1));
} else {
std::string header = ConstructDataHeader(kLen1);
mock_quic_data_.AddWrite(
ASYNC, ConstructAckAndMultipleDataFramesPacket(
3, 1, 1, 1, {header, std::string(kMsg1, kLen1)}));
- mock_quic_data_.AddWrite(SYNCHRONOUS, ConstructAckAndRstOnlyPacket(
- 4, quic::QUIC_STREAM_CANCELLED, 2,
- 2, 1, header.length() + kLen1));
+ mock_quic_data_.AddWrite(
+ SYNCHRONOUS,
+ ConstructAckAndRstOnlyPacket(4, quic::QUIC_STREAM_CANCELLED, 2, 2, 1));
}
Initialize();
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index f3a01d23d..5282eec 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -4763,7 +4763,7 @@
socket_data1.AddWrite(
SYNCHRONOUS, client_maker_.MakeRstPacket(
5, false, GetNthClientInitiatedBidirectionalStreamId(1),
- quic::QUIC_STREAM_CANCELLED, 0,
+ quic::QUIC_STREAM_CANCELLED,
/*include_stop_sending_if_v99=*/true));
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -4975,7 +4975,7 @@
quic_data3.AddWrite(
SYNCHRONOUS, client_maker_.MakeRstPacket(
5, false, GetNthClientInitiatedBidirectionalStreamId(0),
- quic::QUIC_STREAM_CANCELLED, 0,
+ quic::QUIC_STREAM_CANCELLED,
/*include_stop_sending_if_v99=*/true));
quic_data3.AddSocketDataToFactory(socket_factory_.get());
@@ -5710,7 +5710,7 @@
socket_data1.AddWrite(
SYNCHRONOUS, client_maker_.MakeRstPacket(
4, false, GetNthClientInitiatedBidirectionalStreamId(1),
- quic::QUIC_STREAM_CANCELLED, 0,
+ quic::QUIC_STREAM_CANCELLED,
/*include_stop_sending_if_v99=*/true));
socket_data1.AddSocketDataToFactory(socket_factory_.get());
@@ -5836,7 +5836,7 @@
SYNCHRONOUS,
client_maker_.MakeRstPacket(packet_number++, true,
GetNthClientInitiatedBidirectionalStreamId(1),
- quic::QUIC_STREAM_CANCELLED, 0,
+ quic::QUIC_STREAM_CANCELLED,
/*include_stop_sending_if_v99=*/true));
socket_data1.AddRead(
ASYNC,
@@ -5976,7 +5976,7 @@
SYNCHRONOUS,
client_maker_.MakeRstPacket(packet_number++, true,
GetNthClientInitiatedBidirectionalStreamId(1),
- quic::QUIC_STREAM_CANCELLED, 0,
+ quic::QUIC_STREAM_CANCELLED,
/*include_stop_sending_if_v99=*/true));
socket_data1.AddWrite(
SYNCHRONOUS,
diff --git a/net/quic/quic_test_packet_maker.cc b/net/quic/quic_test_packet_maker.cc
index 59ebc90a..395a6416eb 100644
--- a/net/quic/quic_test_packet_maker.cc
+++ b/net/quic/quic_test_packet_maker.cc
@@ -175,7 +175,7 @@
bool include_version,
quic::QuicStreamId stream_id,
quic::QuicRstStreamErrorCode error_code) {
- return MakeRstPacket(num, include_version, stream_id, error_code, 0,
+ return MakeRstPacket(num, include_version, stream_id, error_code,
/*include_stop_sending_if_v99=*/true);
}
@@ -184,13 +184,13 @@
bool include_version,
quic::QuicStreamId stream_id,
quic::QuicRstStreamErrorCode error_code,
- size_t bytes_written,
bool include_stop_sending_if_v99) {
InitializeHeader(num, include_version);
quic::QuicFrames frames;
- quic::QuicRstStreamFrame rst(1, stream_id, error_code, bytes_written);
+ quic::QuicRstStreamFrame rst(1, stream_id, error_code,
+ stream_offsets_[stream_id]);
frames.push_back(quic::QuicFrame(&rst));
DVLOG(1) << "Adding frame: " << frames.back();
@@ -283,7 +283,7 @@
bool send_feedback) {
return MakeAckAndRstPacket(num, include_version, stream_id, error_code,
largest_received, smallest_received, least_unacked,
- send_feedback, 0,
+ send_feedback,
/*include_stop_sending_if_v99=*/true);
}
@@ -297,7 +297,6 @@
uint64_t smallest_received,
uint64_t least_unacked,
bool send_feedback,
- size_t bytes_written,
bool include_stop_sending_if_v99) {
InitializeHeader(num, include_version);
@@ -315,7 +314,8 @@
frames.push_back(quic::QuicFrame(&ack));
DVLOG(1) << "Adding frame: " << frames.back();
- quic::QuicRstStreamFrame rst(1, stream_id, error_code, bytes_written);
+ quic::QuicRstStreamFrame rst(1, stream_id, error_code,
+ stream_offsets_[stream_id]);
frames.push_back(quic::QuicFrame(&rst));
DVLOG(1) << "Adding frame: " << frames.back();
@@ -742,8 +742,7 @@
spdy::SpdyHeaderBlock headers,
quic::QuicStreamId parent_stream_id,
size_t* spdy_headers_frame_length,
- quic::QuicRstStreamErrorCode error_code,
- size_t bytes_written) {
+ quic::QuicRstStreamErrorCode error_code) {
spdy::SpdySerializedFrame spdy_frame = MakeSpdyHeadersFrame(
stream_id, fin, priority, std::move(headers), parent_stream_id);
if (spdy_headers_frame_length) {
@@ -753,7 +752,8 @@
quic::QuicUtils::GetHeadersStreamId(version_.transport_version), false,
quic::QuicStringPiece(spdy_frame.data(), spdy_frame.size()));
- quic::QuicRstStreamFrame rst_frame(1, stream_id, error_code, bytes_written);
+ quic::QuicRstStreamFrame rst_frame(1, stream_id, error_code,
+ stream_offsets_[stream_id]);
quic::QuicFrames frames;
frames.push_back(quic::QuicFrame(headers_frame));
diff --git a/net/quic/quic_test_packet_maker.h b/net/quic/quic_test_packet_maker.h
index 87d9bd6..65c8a57a 100644
--- a/net/quic/quic_test_packet_maker.h
+++ b/net/quic/quic_test_packet_maker.h
@@ -89,7 +89,6 @@
bool include_version,
quic::QuicStreamId stream_id,
quic::QuicRstStreamErrorCode error_code,
- size_t bytes_written,
bool include_stop_sending_if_v99);
std::unique_ptr<quic::QuicReceivedPacket> MakeRstAndRequestHeadersPacket(
@@ -122,7 +121,6 @@
uint64_t smallest_received,
uint64_t least_unacked,
bool send_feedback,
- size_t bytes_written,
bool include_stop_sending_if_v99);
std::unique_ptr<quic::QuicReceivedPacket> MakeRstAckAndConnectionClosePacket(
uint64_t num,
@@ -269,8 +267,7 @@
spdy::SpdyHeaderBlock headers,
quic::QuicStreamId parent_stream_id,
size_t* spdy_headers_frame_length,
- quic::QuicRstStreamErrorCode error_code,
- size_t bytes_written);
+ quic::QuicRstStreamErrorCode error_code);
// If |spdy_headers_frame_length| is non-null, it will be set to the size of
// the SPDY headers frame created for this packet.
