Land Recent QUIC Changes until 03/15/2015.

net/quic/quic_sent_packet_manager.h

Index: net/quic/quic_sent_packet_manager.h
diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index 88d69acfdd9e719c29fd9588d6430ee03a636e9c..7483abfbc7f36dae85ce1b984c5ee9266dd32786 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -215,6 +215,9 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
   // Called by the connection every time it receives a serialized packet.
   void OnSerializedPacket(const SerializedPacket& serialized_packet);
 
+  // No longer retransmit data for |stream_id|.
+  void CancelRetransmissionsForStream(QuicStreamId stream_id);
+
   // Enables pacing if it has not already been enabled.
   void EnablePacing();