Land Recent QUIC Changes until 03/09/2015.

net/quic/quic_sent_packet_manager.cc

Index: net/quic/quic_sent_packet_manager.cc
diff --git a/net/quic/quic_sent_packet_manager.cc b/net/quic/quic_sent_packet_manager.cc
index 3c387472f557d7b4de833d31808016cecf2715af..8a198dbb5cf7fddf3dfbd4a7f3b41f8b00a81d5a 100644
--- a/net/quic/quic_sent_packet_manager.cc
+++ b/net/quic/quic_sent_packet_manager.cc
@@ -141,11 +141,8 @@ void QuicSentPacketManager::SetFromConfig(const QuicConfig& config) {
     send_algorithm_.reset(SendAlgorithmInterface::Create(
         clock_, &rtt_stats_, kReno, stats_, initial_congestion_window_));
   }
-  if (HasClientSentConnectionOption(config, kPACE) ||
-      FLAGS_quic_enable_pacing ||
-      (FLAGS_quic_allow_bbr && HasClientSentConnectionOption(config, kTBBR))) {
-    EnablePacing();
-  }
+  EnablePacing();
+
   if (HasClientSentConnectionOption(config, k1CON)) {
     send_algorithm_->SetNumEmulatedConnections(1);
   }
@@ -936,6 +933,8 @@ void QuicSentPacketManager::OnSerializedPacket(
 }
 
 void QuicSentPacketManager::EnablePacing() {
+  // TODO(ianswett): Replace with a method which wraps the send algorithm in a
+  // pacer every time a new algorithm is set.
   if (using_pacing_) {
     return;
   }