Land Recent QUIC Changes until 03/15/2015.

net/quic/quic_unacked_packet_map.cc

Index: net/quic/quic_unacked_packet_map.cc
diff --git a/net/quic/quic_unacked_packet_map.cc b/net/quic/quic_unacked_packet_map.cc
index 0ada9f62c521c8c5119eb8e6b082db2cb3a33058..87a733bbd3a4698dc587211504349644a482d392 100644
--- a/net/quic/quic_unacked_packet_map.cc
+++ b/net/quic/quic_unacked_packet_map.cc
@@ -273,7 +273,7 @@ bool QuicUnackedPacketMap::IsPacketRemovable(
     QuicPacketSequenceNumber sequence_number,
     const TransmissionInfo& info) const {
   return (!IsPacketUsefulForMeasuringRtt(sequence_number, info) ||
-          unacked_packets_.size() > kMaxTrackedPackets / 2) &&
+          unacked_packets_.size() > kMaxTcpCongestionWindow) &&
          !IsPacketUsefulForCongestionControl(info) &&
          !IsPacketUsefulForRetransmittableData(info);
 }
@@ -300,7 +300,8 @@ void QuicUnackedPacketMap::RemoveFromInFlight(
   }
 }
 
-void QuicUnackedPacketMap::StopRetransmissionForStream(QuicStreamId stream_id) {
+void QuicUnackedPacketMap::CancelRetransmissionsForStream(
+    QuicStreamId stream_id) {
   if (stream_id == kCryptoStreamId || stream_id == kHeadersStreamId) {
     LOG(DFATAL) << "Special streams must always retransmit data: " << stream_id;
     return;