Land Recent QUIC Changes.

net/quic/quic_sent_packet_manager.h

Index: net/quic/quic_sent_packet_manager.h
diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index e6ce902124100015d7455c818a16cdab6ac006f0..dde6e9801f988b601a786c081f918de61e72e0f2 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -52,26 +52,18 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
         QuicByteCount byte_size) {}
 
     virtual void OnSentPacket(
-        QuicPacketSequenceNumber sequence_number,
+        const SerializedPacket& packet,
+        QuicPacketSequenceNumber original_sequence_number,
         QuicTime sent_time,
         QuicByteCount bytes,
         TransmissionType transmission_type) {}
 
-    virtual void OnRetransmittedPacket(
-        QuicPacketSequenceNumber old_sequence_number,
-        QuicPacketSequenceNumber new_sequence_number,
-        TransmissionType transmission_type,
-        QuicTime time) {}
-
     virtual void OnIncomingAck(
         const QuicAckFrame& ack_frame,
         QuicTime ack_receive_time,
         QuicPacketSequenceNumber largest_observed,
         bool largest_observed_acked,
         QuicPacketSequenceNumber least_unacked_sent_packet) {}
-
-    virtual void OnSerializedPacket(
-        const SerializedPacket& packet) {}
   };
 
   // Interface which gets callbacks from the QuicSentPacketManager when
@@ -257,10 +249,6 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
   typedef linked_hash_map<QuicPacketSequenceNumber,
                           TransmissionType> PendingRetransmissionMap;
 
-  // Called when a new packet is serialized.  If the packet contains
-  // retransmittable data, it will be added to the unacked packet map.
-  void OnSerializedPacket(const SerializedPacket& serialized_packet);
-
   // Called when a packet is retransmitted with a new sequence number.
   // Replaces the old entry in the unacked packet map with the new
   // sequence number.
@@ -331,6 +319,11 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
       const SequenceNumberList& all_transmissions,
       QuicPacketSequenceNumber acked_sequence_number);
 
+  // Returns true if the client is sending or the server has received a
+  // connection option.
+  bool HasClientSentConnectionOption(const QuicConfig& config,
+                                     QuicTag tag) const;
+
   // Newly serialized retransmittable and fec packets are added to this map,
   // which contains owning pointers to any contained frames.  If a packet is
   // retransmitted, this map will contain entries for both the old and the new