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 58b92bce081b043b7354d49c9f246d895bd5b630..240166791d2eb4d8a7893ec7ce1714c314ab5dff 100644
--- a/net/quic/congestion_control/send_algorithm_interface.cc
+++ b/net/quic/congestion_control/send_algorithm_interface.cc
@@ -18,18 +18,18 @@ class RttStats;
 SendAlgorithmInterface* SendAlgorithmInterface::Create(
     const QuicClock* clock,
     const RttStats* rtt_stats,
-    CongestionFeedbackType type,
+    CongestionControlType congestion_control_type,
     QuicConnectionStats* stats) {
-  switch (type) {
+  switch (congestion_control_type) {
     case kTCP:
       return new TcpCubicSender(clock, rtt_stats, kUseReno,
                                 kMaxTcpCongestionWindow, stats);
     case kInterArrival:
       LOG(DFATAL) << "InterArrivalSendAlgorithm no longer supported.";
       return NULL;
-    case kFixRate:
+    case kFixRateCongestionControl:
       return new FixRateSender(rtt_stats);
-    case kTCPBBR:
+    case kBBR:
       LOG(DFATAL) << "BbrTcpSender is not supported.";
       return NULL;
   }