Land Recent QUIC Changes.

net/quic/reliable_quic_stream.cc

Index: net/quic/reliable_quic_stream.cc
diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc
index 17c487018ff7719e646e6684968967c03d6ae95e..379991e82264e7c006f40fafb3de5b25af9ef9ba 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);
     }