Landing Recent QUIC changes until 2016-03-15 16:26 UTC

net/quic/congestion_control/send_algorithm_simulator.cc

 // Copyright 2014 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/send_algorithm_simulator.h"
 
 #include <stdint.h>
 
 #include <limits>
 
@@ skipping 130 matching lines @@
   for (vector<Transfer>::iterator it = pending_transfers_.begin();
        it != pending_transfers_.end(); ++it) {
     // If we've already sent enough bytes, wait for them to be acked.
     if (it->bytes_acked + it->bytes_in_flight >= it->num_bytes) {
       continue;
     }
     // If the flow hasn't started, use the start time.
     QuicTime::Delta transfer_send_time = it->start_time.Subtract(clock_->Now());
     if (clock_->Now() >= it->start_time) {
       transfer_send_time = it->sender->send_algorithm->TimeUntilSend(
-          clock_->Now(), it->bytes_in_flight, HAS_RETRANSMITTABLE_DATA);
+          clock_->Now(), it->bytes_in_flight);
     }
     if (transfer_send_time < next_send_time) {
       next_send_time = transfer_send_time;
       transfer = &(*it);
     }
   }
   DVLOG(1) << "NextSendTime returning delta(ms):"
            << next_send_time.ToMilliseconds() << ", transfer '"
            << transfer->name;
   return PacketEvent(next_send_time, transfer);
@@ skipping 223 matching lines @@
     sent_packets_.push_back(SentPacket(sender->last_sent, clock_->Now(),
                                        ack_time, packet_lost, transfer));
   } else {
     DVLOG(1) << "losing packet:" << sender->last_sent
              << " name:" << transfer->name << " because the buffer was full.";
   }
   transfer->bytes_in_flight += kPacketSize;
 }
 
 }  // namespace net