Update from https://crrev.com/306655

net/quic/congestion_control/send_algorithm_simulator.h

 // 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.
 
 // A test only class to enable simulations of send algorithms.
 
 #ifndef NET_QUIC_CONGESTION_CONTROL_SEND_ALGORITHM_SIMULATOR_H_
 #define NET_QUIC_CONGESTION_CONTROL_SEND_ALGORITHM_SIMULATOR_H_
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_time.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using base::StringPrintf;
 
 namespace net {
 
 class SendAlgorithmSimulator {
  public:
   struct Sender {
-    Sender(SendAlgorithmInterface* send_algorithm, RttStats* rtt_stats);
+    Sender(SendAlgorithmInterface* send_algorithm,
+           RttStats* rtt_stats);
+    Sender(SendAlgorithmInterface* send_algorithm,
+           RttStats* rtt_stats,
+           QuicTime::Delta additional_rtt);
 
     void RecordStats() {
       QuicByteCount cwnd = send_algorithm->GetCongestionWindow();
       max_cwnd = std::max(max_cwnd, cwnd);
       min_cwnd = std::min(min_cwnd, cwnd);
       if (last_cwnd > cwnd) {
         max_cwnd_drop = std::max(max_cwnd_drop, last_cwnd - cwnd);
       }
       last_cwnd = cwnd;
     }
 
     std::string DebugString() {
       return StringPrintf("observed goodput(bytes/s):%" PRId64
                           " loss rate:%f"
                           " cwnd:%" PRIu64
                           " max_cwnd:%" PRIu64 " min_cwnd:%" PRIu64
                           " max_cwnd_drop:%" PRIu64,
                           last_transfer_bandwidth.ToBytesPerSecond(),
                           last_transfer_loss_rate,
                           send_algorithm->GetCongestionWindow(),
                           max_cwnd, min_cwnd, max_cwnd_drop);
     }
 
     SendAlgorithmInterface* send_algorithm;
     RttStats* rtt_stats;
+    QuicTime::Delta additional_rtt;
 
     // Last sequence number the sender sent.
     QuicPacketSequenceNumber last_sent;
     // Last packet sequence number acked.
     QuicPacketSequenceNumber last_acked;
     // Packet sequence number to ack up to.
     QuicPacketSequenceNumber next_acked;
 
     // Stats collected for understanding the congestion control.
     QuicByteCount max_cwnd;
     QuicByteCount min_cwnd;
     QuicByteCount max_cwnd_drop;
     QuicByteCount last_cwnd;
 
     QuicBandwidth last_transfer_bandwidth;
     float last_transfer_loss_rate;
   };
 
   struct Transfer {
-    Transfer(Sender* sender, QuicByteCount num_bytes, QuicTime start_time)
-        : sender(sender),
-          num_bytes(num_bytes),
-          bytes_acked(0),
-          bytes_lost(0),
-          bytes_in_flight(0),
-          start_time(start_time) {}
+    Transfer(Sender* sender,
+             QuicByteCount num_bytes,
+             QuicTime start_time,
+             string name);
 
     Sender* sender;
     QuicByteCount num_bytes;
     QuicByteCount bytes_acked;
     QuicByteCount bytes_lost;
     QuicByteCount bytes_in_flight;
     QuicTime start_time;
+    string name;
   };
 
   struct SentPacket {
     SentPacket()
         : sequence_number(0),
           send_time(QuicTime::Zero()),
           ack_time(QuicTime::Zero()),
           lost(false),
           transfer(nullptr) {}
     SentPacket(QuicPacketSequenceNumber sequence_number,
@@ skipping 48 matching lines @@
   }
 
   // Advance the time by |delta| without sending anything.
   void AdvanceTime(QuicTime::Delta delta);
 
   // Adds a pending sender.  The send will run when TransferBytes is called.
   // Adding two transfers with the same sender is unsupported.
   void AddTransfer(Sender* sender, size_t num_bytes);
 
   // Adds a pending sending to start at the specified time.
-  void AddTransfer(Sender* sender, size_t num_bytes, QuicTime start_time);
+  void AddTransfer(
+      Sender* sender, size_t num_bytes, QuicTime start_time, string name);
 
   // Convenience method to transfer all bytes.
   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.
   void TransferBytes(QuicByteCount max_bytes, QuicTime::Delta max_time);
 
  private:
@@ skipping 54 matching lines @@
   QuicTime::Delta rtt_;
   size_t buffer_size_;       // In bytes.
   QuicTime::Delta delayed_ack_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(SendAlgorithmSimulator);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CONGESTION_CONTROL_SEND_ALGORITHM_SIMULATOR_H_