Landing Recent QUIC Changes.

net/quic/congestion_control/receive_algorithm_interface.cc

Index: net/quic/congestion_control/receive_algorithm_interface.cc
diff --git a/net/quic/congestion_control/receive_algorithm_interface.cc b/net/quic/congestion_control/receive_algorithm_interface.cc
index 4f608580c7f993047df68fd482c98639cb56e877..91d29dcd4e82782a6b02833a9cc216a0ac0d7fbe 100644
--- a/net/quic/congestion_control/receive_algorithm_interface.cc
+++ b/net/quic/congestion_control/receive_algorithm_interface.cc
@@ -5,7 +5,6 @@
 #include "net/quic/congestion_control/receive_algorithm_interface.h"
 
 #include "net/quic/congestion_control/tcp_receiver.h"
-#include "net/quic/congestion_control/timestamp_receiver.h"
 
 namespace net {
 
@@ -16,7 +15,8 @@ ReceiveAlgorithmInterface* ReceiveAlgorithmInterface::Create(
     case kTCP:
       return new TcpReceiver();
     case kTimestamp:
-      return new TimestampReceiver();
+      LOG(DFATAL) << "Timestamp congestion feedback is not supported";
+      return NULL;
   }
   return NULL;
 }