Remove EncryptionLevel from QUIC's RetransmittableFrames and add it to TransmissionInfo. No functi…

net/quic/quic_packet_creator.cc

Index: net/quic/quic_packet_creator.cc
diff --git a/net/quic/quic_packet_creator.cc b/net/quic/quic_packet_creator.cc
index 98eb12197f6f91474622d7f8a966d50a7b612942..312a738dd311c8e8d32e53c925af6fab8290cf6c 100644
--- a/net/quic/quic_packet_creator.cc
+++ b/net/quic/quic_packet_creator.cc
@@ -396,6 +396,7 @@ void QuicPacketCreator::CopyToBuffer(QuicIOVector iov,
 
 SerializedPacket QuicPacketCreator::ReserializeAllFrames(
     const RetransmittableFrames& frames,
+    EncryptionLevel original_encryption_level,
     QuicPacketNumberLength original_length,
     char* buffer,
     size_t buffer_len) {
@@ -411,7 +412,7 @@ SerializedPacket QuicPacketCreator::ReserializeAllFrames(
   packet_number_length_ = original_length;
   next_packet_number_length_ = original_length;
   fec_protect_ = false;
-  encryption_level_ = frames.encryption_level();
+  encryption_level_ = original_encryption_level;
   needs_padding_ = frames.needs_padding();
 
   // Serialize the packet and restore the FEC and packet number length state.
@@ -702,8 +703,7 @@ bool QuicPacketCreator::AddFrame(const QuicFrame& frame,
 
   if (save_retransmittable_frames && ShouldRetransmit(frame)) {
     if (queued_retransmittable_frames_.get() == nullptr) {
-      queued_retransmittable_frames_.reset(
-          new RetransmittableFrames(encryption_level_));
+      queued_retransmittable_frames_.reset(new RetransmittableFrames());
     }
     queued_frames_.push_back(
         queued_retransmittable_frames_->AddFrame(frame, buffer.Pass()));