Landing Recent QUIC changes until Jun 27 19:50:48 2017 +0000

net/quic/core/congestion_control/bbr_sender.h

Index: net/quic/core/congestion_control/bbr_sender.h
diff --git a/net/quic/core/congestion_control/bbr_sender.h b/net/quic/core/congestion_control/bbr_sender.h
index 31102b7d91f33483880b73bff1009d1cdfb2cf02..767f061476ecbd5ebfde42e97154883435b9365a 100644
--- a/net/quic/core/congestion_control/bbr_sender.h
+++ b/net/quic/core/congestion_control/bbr_sender.h
@@ -249,6 +249,10 @@ class QUIC_EXPORT_PRIVATE BbrSender : public SendAlgorithmInterface {
   QuicTime aggregation_epoch_start_time_;
   QuicByteCount aggregation_epoch_bytes_;
 
+  // The number of bytes acknowledged since the last time bytes in flight
+  // dropped below the target window.
+  QuicByteCount bytes_acked_since_queue_drained_;
+
   // Minimum RTT estimate.  Automatically expires within 10 seconds (and
   // triggers PROBE_RTT mode) if no new value is sampled during that period.
   QuicTime::Delta min_rtt_;
@@ -334,6 +338,9 @@ class QUIC_EXPORT_PRIVATE BbrSender : public SendAlgorithmInterface {
   std::deque<DataDelivered> recently_acked_;
   QuicByteCount bytes_recently_acked_;
 
+  // When true, recovery is rate based rather than congestion window based.
+  bool rate_based_recovery_;
+
   DISALLOW_COPY_AND_ASSIGN(BbrSender);
 };