Land Recent QUIC Changes

net/quic/congestion_control/send_algorithm_interface.cc

Index: net/quic/congestion_control/send_algorithm_interface.cc
diff --git a/net/quic/congestion_control/send_algorithm_interface.cc b/net/quic/congestion_control/send_algorithm_interface.cc
index 240166791d2eb4d8a7893ec7ce1714c314ab5dff..5d0e032daffda4d983d2a21bf4320fbc51e70b60 100644
--- a/net/quic/congestion_control/send_algorithm_interface.cc
+++ b/net/quic/congestion_control/send_algorithm_interface.cc
@@ -10,8 +10,6 @@
 
 namespace net {
 
-const bool kUseReno = false;
-
 class RttStats;
 
 // Factory for send side congestion control algorithm.
@@ -21,12 +19,14 @@ SendAlgorithmInterface* SendAlgorithmInterface::Create(
     CongestionControlType congestion_control_type,
     QuicConnectionStats* stats) {
   switch (congestion_control_type) {
-    case kTCP:
-      return new TcpCubicSender(clock, rtt_stats, kUseReno,
+    case kCubic:
+      return new TcpCubicSender(clock, rtt_stats,
+                                false /* don't use Reno */,
+                                kMaxTcpCongestionWindow, stats);
+    case kReno:
+      return new TcpCubicSender(clock, rtt_stats,
+                                true /* use Reno */,
                                 kMaxTcpCongestionWindow, stats);
-    case kInterArrival:
-      LOG(DFATAL) << "InterArrivalSendAlgorithm no longer supported.";
-      return NULL;
     case kFixRateCongestionControl:
       return new FixRateSender(rtt_stats);
     case kBBR: