Land Recent QUIC Changes.

Change QUIC's RTO implementation. Protected by FLAGS_quic_use_new_rto.

Decides whether to invoke SendAlgorithmInterface's
OnRetransmissionTimeout after an ack has been received instead of
pro-actively invoking it and then having to revert it.

Fix a minor QUIC bug when both quic_use_new_rto and
quic_rto_uses_last_sent were enabled, a spurious retransmission didn't
expire the SRTT.

Merge internal change: 83625311, 83966746

https://codereview.chromium.org/841603005/

Remove unused original transmission stats from QuicAckNotifier.
No behavior change.

Merge internal change: 83598791
https://codereview.chromium.org/798873005/

Removing quic version 21

Merge internal change: 83551025
https://codereview.chromium.org/786953009/

Fixes typo, changing OnSpuriousPacketRetransmition to
OnSpuriousPacketRetransmission.

Merge internal change: 83546153
https://codereview.chromium.org/837273004/

Adds an alarm for sending a QUIC FEC packet.

This CL adds an alarm for sending an FEC packet. The alarm is based on
the connection's SRTT, and is set when the first FEC protected packet in
an FEC group is sent. This alarm puts some time between the sending of
an FEC protected packet and the corresponding FEC packet, to reduce the
probability of both these packets getting dropped in the network.

Merge internal change: 83543120
https://codereview.chromium.org/839163003/

Tell the QUIC AckNotifierManager about packets on serialization, rather
than when successfully sent.
Protected by ENABLEd FLAGS_quic_ack_notifier_informed_on_serialized.

Merge internal change: 83525991
https://codereview.chromium.org/854463003/

R=rch@chromium.org
BUG=448688

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

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

1 files changed, 2 insertions, 10 deletions

diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc
index 17c4870..379991e8 100644
--- a/net/quic/reliable_quic_stream.cc
+++ b/net/quic/reliable_quic_stream.cc
@@ -56,28 +56,20 @@ class ReliableQuicStream::ProxyAckNotifierDelegate
       : delegate_(delegate),
         pending_acks_(0),
         wrote_last_data_(false),
-        num_original_packets_(0),
-        num_original_bytes_(0),
         num_retransmitted_packets_(0),
         num_retransmitted_bytes_(0) {
   }
 
-  void OnAckNotification(int num_original_packets,
-                         int num_original_bytes,
-                         int num_retransmitted_packets,
+  void OnAckNotification(int num_retransmitted_packets,
                          int num_retransmitted_bytes,
                          QuicTime::Delta delta_largest_observed) override {
     DCHECK_LT(0, pending_acks_);
     --pending_acks_;
-    num_original_packets_ += num_original_packets;
-    num_original_bytes_ += num_original_bytes;
     num_retransmitted_packets_ += num_retransmitted_packets;
     num_retransmitted_bytes_ += num_retransmitted_bytes;
 
     if (wrote_last_data_ && pending_acks_ == 0) {
-      delegate_->OnAckNotification(num_original_packets_,
-                                   num_original_bytes_,
-                                   num_retransmitted_packets_,
+      delegate_->OnAckNotification(num_retransmitted_packets_,
                                    num_retransmitted_bytes_,
                                    delta_largest_observed);
     }