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 e5c33299825cab65d0b438790be2f6a9e5fb9693..58b92bce081b043b7354d49c9f246d895bd5b630 100644
--- a/net/quic/congestion_control/send_algorithm_interface.cc
+++ b/net/quic/congestion_control/send_algorithm_interface.cc
@@ -29,6 +29,9 @@ SendAlgorithmInterface* SendAlgorithmInterface::Create(
       return NULL;
     case kFixRate:
       return new FixRateSender(rtt_stats);
+    case kTCPBBR:
+      LOG(DFATAL) << "BbrTcpSender is not supported.";

[wtc, 2014/05/19 18:58:40]

Nit: Is the class named BbrTcpSender or TcpBbrSender?

[ramant (doing other things), 2014/05/20 03:22:32]

It is called BbrTcpSender (internally).

Ian: Should we rename kTCPBBR to kBBRTCP or should we BbrTcpSender to
TcpBbrSender.

+      return NULL;
   }
   return NULL;
 }