Land Recent QUIC Changes until 05/13/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 2beef66b046226f42a899855f28d191bd0c17b18..c81c93df8e389f67235aaf8438ab0d04d41340d8 100644
--- a/net/quic/quic_sent_packet_manager.cc
+++ b/net/quic/quic_sent_packet_manager.cc
@@ -166,10 +166,8 @@ void QuicSentPacketManager::SetFromConfig(const QuicConfig& config) {
     receive_buffer_bytes_ =
         max(kMinSocketReceiveBuffer,
             static_cast<QuicByteCount>(config.ReceivedSocketReceiveBuffer()));
-    if (FLAGS_quic_limit_max_cwnd_to_receive_buffer) {
-      send_algorithm_->SetMaxCongestionWindow(receive_buffer_bytes_ *
-                                              kUsableRecieveBufferFraction);
-    }
+    send_algorithm_->SetMaxCongestionWindow(receive_buffer_bytes_ *
+                                            kUsableRecieveBufferFraction);
   }
   send_algorithm_->SetFromConfig(config, perspective_);
 
@@ -783,11 +781,6 @@ QuicTime::Delta QuicSentPacketManager::TimeUntilSend(
   if (pending_timer_transmission_count_ > 0) {
     return QuicTime::Delta::Zero();
   }
-  if (!FLAGS_quic_limit_max_cwnd_to_receive_buffer &&
-      unacked_packets_.bytes_in_flight() >=
-          kUsableRecieveBufferFraction * receive_buffer_bytes_) {
-    return QuicTime::Delta::Infinite();
-  }
   return send_algorithm_->TimeUntilSend(
       now, unacked_packets_.bytes_in_flight(), retransmittable);
 }