Land Recent QUIC Changes.

Change the pre-handshake idle timeout to 5s from 120s, and the default
idle timeout is 30s.

This ensures clients don't wait more than 5s if the connection has UDP
blackholed.

Merge internal change: 76444120
https://codereview.chromium.org/610073002/

Add a convenience method to check for client supplied options in
QuicSentPacketManager.

Merge internal change: 76423808
https://codereview.chromium.org/607803004/

Add a QUIC tag to connection options to allow negotiating 1 connection
emulation in congestion control algorithms.

Merge internal change: 76351810
https://codereview.chromium.org/606503004/

Allow the number of connections QUIC's send algorithms simulate to
change, either initially or throughout the connection.

Merge internal change: 76297032
https://codereview.chromium.org/610053002/

Remove support for QUIC_VERSION_16.

Merge internal change: 76286812
https://codereview.chromium.org/601663004/

QUIC server max streams is now at least 10 streams larger than
configured limit. Protected by existing
FLAGS_quic_allow_more_open_streams.

Merge internal change: 76269911
https://codereview.chromium.org/607763007/

No functional change.  Rename QuicConfig methods from lowercase with
underscores to CamelCase, since they're not direct field accessors.

Merge internal change: 76185470
https://codereview.chromium.org/608453007/

Add a test to ensure QUIC's TcpCubicSender always allows packets to be
sent when there is less than a packet in flight.

Merge internal change: 76165601
https://codereview.chromium.org/608003002/

Merge QuicSentPacketManager::DebugDelegate's OnSentPacket,
OnRetransmittedPacket, and OnSerializedPacket into one OnSentPacket.

Merge internal change: 76088200
https://codereview.chromium.org/607983002/

Remove OnPacketRetransmitted from QuicConnectionDebugVisitor.

Merge internal change: 76084748
https://codereview.chromium.org/605263003/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/605163004

Cr-Commit-Position: refs/heads/master@{#297225}

1 files changed, 7 insertions, 14 deletions

diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index e6ce902..dde6e98 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