Land Recent QUIC Changes.

net/quic/congestion_control/inter_arrival_probe.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/congestion_control/inter_arrival_probe.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 
 namespace {
@@ skipping 33 matching lines @@
   }
 }
 
 void InterArrivalProbe::OnAcknowledgedPacket(QuicByteCount bytes) {
   if (!estimate_available_) {
     DCHECK_LE(bytes, unacked_data_);
     unacked_data_ -= bytes;
   }
 }
 
+void InterArrivalProbe::OnRetransmissionTimeout() {
+  if (!estimate_available_) {
+    unacked_data_ = 0;
+  }
+}
+
 QuicByteCount InterArrivalProbe::GetAvailableCongestionWindow() {
   if (estimate_available_) {
     return 0;
   }
   return (kProbeSizePackets * max_segment_size_) - unacked_data_;
 }
 
 void InterArrivalProbe::OnIncomingFeedback(
     QuicPacketSequenceNumber sequence_number,
     QuicByteCount bytes_sent,
@@ skipping 49 matching lines @@
       break;
   }
   estimate_available_ = true;
   available_channel_estimator_.reset(NULL);
   DVLOG(1) << "Probe estimate:"
              << available_channel_estimate_.ToKBitsPerSecond()
              << " Kbits/s";
 }
 
 }  // namespace net