Landing Recent QUIC Changes.

net/quic/quic_connection.h

Index: net/quic/quic_connection.h
diff --git a/net/quic/quic_connection.h b/net/quic/quic_connection.h
index 6bbb84fdfdf058f39eac13c77200d32230c05738..9251c20ef1ce0285afe999fca75104a22a5d9ca1 100644
--- a/net/quic/quic_connection.h
+++ b/net/quic/quic_connection.h
@@ -601,9 +601,7 @@ class NET_EXPORT_PRIVATE QuicConnection
   void WritePendingRetransmissions();
 
   // Returns true if the packet should be discarded and not sent.
-  bool ShouldDiscardPacket(EncryptionLevel level,
-                           QuicPacketSequenceNumber sequence_number,
-                           HasRetransmittableData retransmittable);
+  bool ShouldDiscardPacket(const QueuedPacket& packet);
 
   // Queues |packet| in the hopes that it can be decrypted in the
   // future, when a new key is installed.
@@ -657,7 +655,7 @@ class NET_EXPORT_PRIVATE QuicConnection
   void CheckForAddressMigration(const IPEndPoint& self_address,
                                 const IPEndPoint& peer_address);
 
-  HasRetransmittableData IsRetransmittable(QueuedPacket packet);
+  HasRetransmittableData IsRetransmittable(const QueuedPacket& packet);
   bool IsConnectionClose(QueuedPacket packet);
 
   QuicFramer framer_;