Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(420)

Unified Diff: net/quic/test_tools/quic_test_packet_maker.cc

Issue 413403008: Remove QUIC_VERSION_15 now that Chrome Stable supports QUIC_VERSION_16. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Final_0723
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/test_tools/quic_connection_peer.cc ('k') | net/quic/test_tools/quic_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/test_tools/quic_test_packet_maker.cc
diff --git a/net/quic/test_tools/quic_test_packet_maker.cc b/net/quic/test_tools/quic_test_packet_maker.cc
index 7f0835f8bdfe5a1666a6a93669f4f6de899e7cbc..41361bd83f8c33272695fa50f069d53b6534bfca 100644
--- a/net/quic/test_tools/quic_test_packet_maker.cc
+++ b/net/quic/test_tools/quic_test_packet_maker.cc
@@ -61,7 +61,7 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckAndRstPacket(
header.fec_flag = false;
header.fec_group = 0;
- QuicAckFrame ack(MakeAckFrame(largest_received, least_unacked));
+ QuicAckFrame ack(MakeAckFrame(largest_received));
ack.received_info.delta_time_largest_observed = QuicTime::Delta::Zero();
QuicFrames frames;
frames.push_back(QuicFrame(&ack));
@@ -74,10 +74,8 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckAndRstPacket(
}
QuicStopWaitingFrame stop_waiting;
- if (version_ > QUIC_VERSION_15) {
- stop_waiting.least_unacked = least_unacked;
- frames.push_back(QuicFrame(&stop_waiting));
- }
+ stop_waiting.least_unacked = least_unacked;
+ frames.push_back(QuicFrame(&stop_waiting));
QuicRstStreamFrame rst(stream_id, error_code, 0);
frames.push_back(QuicFrame(&rst));
@@ -122,7 +120,7 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckPacket(
header.fec_flag = false;
header.fec_group = 0;
- QuicAckFrame ack(MakeAckFrame(largest_received, least_unacked));
+ QuicAckFrame ack(MakeAckFrame(largest_received));
ack.received_info.delta_time_largest_observed = QuicTime::Delta::Zero();
QuicCongestionFeedbackFrame feedback;
@@ -137,10 +135,8 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckPacket(
}
QuicStopWaitingFrame stop_waiting;
- if (version_ > QUIC_VERSION_15) {
- stop_waiting.least_unacked = least_unacked;
- frames.push_back(QuicFrame(&stop_waiting));
- }
+ stop_waiting.least_unacked = least_unacked;
+ frames.push_back(QuicFrame(&stop_waiting));
scoped_ptr<QuicPacket> packet(
BuildUnsizedDataPacket(&framer, header, frames).packet);
« no previous file with comments | « net/quic/test_tools/quic_connection_peer.cc ('k') | net/quic/test_tools/quic_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698