Land Recent QUIC Changes until 03/09/2015.

net/quic/quic_protocol.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_QUIC_QUIC_PROTOCOL_H_
 #define NET_QUIC_QUIC_PROTOCOL_H_
 
 #include <stddef.h>
 #include <limits>
 #include <list>
@@ skipping 961 matching lines @@
  public:
   explicit RetransmittableFrames(EncryptionLevel level);
   ~RetransmittableFrames();
 
   // Allocates a local copy of the referenced StringPiece has QuicStreamFrame
   // use it.
   // Takes ownership of |stream_frame|.
   const QuicFrame& AddStreamFrame(QuicStreamFrame* stream_frame);
   // Takes ownership of the frame inside |frame|.
   const QuicFrame& AddNonStreamFrame(const QuicFrame& frame);
+  // Removes all stream frames associated with |stream_id|.
+  void RemoveFramesForStream(QuicStreamId stream_id);
+
   const QuicFrames& frames() const { return frames_; }
 
   IsHandshake HasCryptoHandshake() const {
     return has_crypto_handshake_;
   }
 
   EncryptionLevel encryption_level() const {
     return encryption_level_;
   }
 
@@ skipping 53 matching lines @@
   bool in_flight;
   // True if the packet can never be acked, so it can be removed.
   bool is_unackable;
   // True if the packet is an FEC packet.
   bool is_fec_packet;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PROTOCOL_H_