Land Recent QUIC Changes.

Remove loss detection from QuicConfig now that connection options has
replaced it.

Merge internal change: 75952172

Chromium specific changes:
+ Deleted enable_quic_time_based_loss_detection from
  NetworkSession params.
+ Deleted enable-quic-time-based-loss-detection and
  disable-quic-time-based-loss-detection command line
  switches.

https://codereview.chromium.org/591323003/

Do not timeout QUIC connections when settings the timeouts from
InitializeSession(). Protected by FLAG_quic_timeouts_only_from_alarms

Removes FLAG_quic_timeouts_require_activity which was somewhat broken.

Merge internal change: 75927669
https://codereview.chromium.org/605903002/

Factor out the QUIC timeout alarm setting logic from the CheckForTimeout
method into a new SetTimeout method.

- no behavior change, simply moving QUIC timeout alarm code.

Merge internal change: 75915264
https://codereview.chromium.org/593193005/

Add a timestamp field to QUIC's CachedNetworkParams proto message.

Context in b/17357338, follow-up CL will store CachedNetworkParams and
copy into newly created STKs.

Merge internal change: 75897792
https://codereview.chromium.org/604173002/

Call QuicSentPacketManager's OnPacketSent method and make
OnRetransmittedPacket and OnSerializedPacket private.

Merge internal change: 75830237
https://codereview.chromium.org/593193004/

Change the return type of QuicConnection::CheckForTimeout from bool to
void since it is unused.

Merge internal change: 75724127
https://codereview.chromium.org/604163002/

Test-only.  Remove calls to OnSerializedPacket from
QuicSentPacketManagerTest, in preparation for OnSerializedPacket to be
removed.

Merge internal change: 75716236
https://codereview.chromium.org/600823006/

R=rch@chromium.org, sky@chromium.org

Added sky@ for OWNERS approval for chrome/browser and chrome/common
changes

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

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

1 files changed, 12 insertions, 11 deletions

diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index e6499ff..e6ce902 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -115,16 +115,6 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
 
   void SetHandshakeConfirmed() { handshake_confirmed_ = true; }
 
-  // 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.
-  void OnRetransmittedPacket(QuicPacketSequenceNumber old_sequence_number,
-                             QuicPacketSequenceNumber new_sequence_number);
-
   // Processes the incoming ack.
   void OnIncomingAck(const QuicAckFrame& ack_frame,
                      QuicTime ack_receive_time);
@@ -169,7 +159,8 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
   // Called when we have sent bytes to the peer.  This informs the manager both
   // the number of bytes sent and if they were retransmitted.  Returns true if
   // the sender should reset the retransmission timer.
-  virtual bool OnPacketSent(QuicPacketSequenceNumber sequence_number,
+  virtual bool OnPacketSent(SerializedPacket* serialized_packet,
+                            QuicPacketSequenceNumber original_sequence_number,
                             QuicTime sent_time,
                             QuicByteCount bytes,
                             TransmissionType transmission_type,
@@ -266,6 +257,16 @@ 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.
+  void OnRetransmittedPacket(QuicPacketSequenceNumber old_sequence_number,
+                             QuicPacketSequenceNumber new_sequence_number);
+
   // Updates the least_packet_awaited_by_peer.
   void UpdatePacketInformationReceivedByPeer(const QuicAckFrame& ack_frame);