Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/congestion_control/send_algorithm_simulator.h

Index: net/quic/core/congestion_control/send_algorithm_simulator.h
diff --git a/net/quic/core/congestion_control/send_algorithm_simulator.h b/net/quic/core/congestion_control/send_algorithm_simulator.h
index fd93e27e9bc0ffbf3fb04a21dd309a2238c52f52..9b3974bdd2d740c6b4f0b990223ffe856bec62e4 100644
--- a/net/quic/core/congestion_control/send_algorithm_simulator.h
+++ b/net/quic/core/congestion_control/send_algorithm_simulator.h
@@ -168,10 +168,17 @@ class SendAlgorithmSimulator {
   void TransferBytes();
 
   // Transfers bytes through the connection until |max_bytes| are reached,
-  // |max_time| is reached, or all senders have finished sending.  If max_bytes
-  // is 0, it does not apply, and if |max_time| is Zero, no time limit applies.
+  // |max_time| is reached, or all senders have finished sending.  If |max_time|
+  // is Zero, no time limit applies.
   void TransferBytes(QuicByteCount max_bytes, QuicTime::Delta max_time);
 
+  // Transfers bytes through the connection until the supplied termination
+  // predicate returns true, or until all senders have finished sending.
+  // Returns true if the transfer was terminated due to the predicate, and false
+  // otherwise.
+  template <class TerminationPredicate>
+  bool TransferBytesUntil(TerminationPredicate termination_predicate);
+
  private:
   // A pending packet event, either a send or an ack.
   struct PacketEvent {