Land Recent QUIC Changes.

net/quic/congestion_control/send_algorithm_simulator.cc

Index: net/quic/congestion_control/send_algorithm_simulator.cc
diff --git a/net/quic/congestion_control/send_algorithm_simulator.cc b/net/quic/congestion_control/send_algorithm_simulator.cc
index d539013c10e1109b5f6eaba3c229ed74ed7d6fb5..3b8ca70a8ad7d8bb93b42f7756e8daa7d766a8e2 100644
--- a/net/quic/congestion_control/send_algorithm_simulator.cc
+++ b/net/quic/congestion_control/send_algorithm_simulator.cc
@@ -238,8 +238,8 @@ void SendAlgorithmSimulator::SendDataNow() {
     // If the number of bytes in flight are less than the bdp, there's
     // no buffering delay.  Bytes lost from the buffer are not counted.
     QuicByteCount bdp = bandwidth_.ToBytesPerPeriod(rtt_);
-    if (sent_packets_.size() * kPacketSize > bdp) {
-      QuicByteCount qsize = sent_packets_.size() * kPacketSize - bdp;
+    if ((sent_packets_.size() + 1) * kPacketSize > bdp) {
+      QuicByteCount qsize = (sent_packets_.size() + 1) * kPacketSize - bdp;
       ack_time = ack_time.Add(bandwidth_.TransferTime(qsize));
     }
     // If the packet is lost, give it an ack time of Zero.