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

Side by Side Diff: net/quic/quic_sent_packet_manager_test.cc

Issue 1495243002: Remove EncryptionLevel from QUIC's RetransmittableFrames and add it to TransmissionInfo. No functi… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@108735153
Patch Set: Created 5 years 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 unified diff | Download patch
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | net/quic/quic_unacked_packet_map.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_sent_packet_manager.h" 5 #include "net/quic/quic_sent_packet_manager.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "net/quic/quic_flags.h" 8 #include "net/quic/quic_flags.h"
9 #include "net/quic/test_tools/quic_config_peer.h" 9 #include "net/quic/test_tools/quic_config_peer.h"
10 #include "net/quic/test_tools/quic_sent_packet_manager_peer.h" 10 #include "net/quic/test_tools/quic_sent_packet_manager_peer.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 SerializedPacket CreateDataPacket(QuicPacketNumber packet_number) { 179 SerializedPacket CreateDataPacket(QuicPacketNumber packet_number) {
180 return CreatePacket(packet_number, true); 180 return CreatePacket(packet_number, true);
181 } 181 }
182 182
183 SerializedPacket CreatePacket(QuicPacketNumber packet_number, 183 SerializedPacket CreatePacket(QuicPacketNumber packet_number,
184 bool retransmittable) { 184 bool retransmittable) {
185 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength)); 185 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
186 RetransmittableFrames* frames = nullptr; 186 RetransmittableFrames* frames = nullptr;
187 if (retransmittable) { 187 if (retransmittable) {
188 frames = new RetransmittableFrames(ENCRYPTION_NONE); 188 frames = new RetransmittableFrames();
189 frames->AddFrame( 189 frames->AddFrame(
190 QuicFrame(new QuicStreamFrame(kStreamId, false, 0, StringPiece()))); 190 QuicFrame(new QuicStreamFrame(kStreamId, false, 0, StringPiece())));
191 } 191 }
192 return SerializedPacket(packet_number, PACKET_6BYTE_PACKET_NUMBER, 192 return SerializedPacket(packet_number, PACKET_6BYTE_PACKET_NUMBER,
193 packets_.back(), 0u, frames, false, false); 193 packets_.back(), 0u, frames, false, false);
194 } 194 }
195 195
196 SerializedPacket CreateFecPacket(QuicPacketNumber packet_number) { 196 SerializedPacket CreateFecPacket(QuicPacketNumber packet_number) {
197 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength)); 197 packets_.push_back(new QuicEncryptedPacket(nullptr, kDefaultLength));
198 SerializedPacket serialized(packet_number, PACKET_6BYTE_PACKET_NUMBER, 198 SerializedPacket serialized(packet_number, PACKET_6BYTE_PACKET_NUMBER,
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after
1685 1685
1686 EXPECT_CALL(*send_algorithm_, ResumeConnectionState(_, false)); 1686 EXPECT_CALL(*send_algorithm_, ResumeConnectionState(_, false));
1687 manager_.ResumeConnectionState(cached_network_params, false); 1687 manager_.ResumeConnectionState(cached_network_params, false);
1688 EXPECT_EQ(kRttMs * kNumMicrosPerMilli, 1688 EXPECT_EQ(kRttMs * kNumMicrosPerMilli,
1689 static_cast<uint64>(manager_.GetRttStats()->initial_rtt_us())); 1689 static_cast<uint64>(manager_.GetRttStats()->initial_rtt_us()));
1690 } 1690 }
1691 1691
1692 } // namespace 1692 } // namespace
1693 } // namespace test 1693 } // namespace test
1694 } // namespace net 1694 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | net/quic/quic_unacked_packet_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698