Landing Recent QUIC changes until: Fri Oct 30 22:23:58 2015 +0000

net/quic/quic_spdy_stream.h

Index: net/quic/quic_spdy_stream.h
diff --git a/net/quic/quic_spdy_stream.h b/net/quic/quic_spdy_stream.h
index 781b005f8baaec69bbfe3460ccc838e6e54462b1..48e74b125882e3f123f3084380dcb288e89f5cf3 100644
--- a/net/quic/quic_spdy_stream.h
+++ b/net/quic/quic_spdy_stream.h
@@ -78,6 +78,10 @@ class NET_EXPORT_PRIVATE QuicSpdyStream : public ReliableQuicStream {
   // should be closed; no more data will be sent by the peer.
   virtual void OnStreamHeadersComplete(bool fin, size_t frame_len);
 
+  // Override the base class to not discard response when receiving
+  // QUIC_STREAM_NO_ERROR on QUIC_VERSION_29 and later versions.
+  void OnStreamReset(const QuicRstStreamFrame& frame) override;
+
   // Writes the headers contained in |header_block| to the dedicated
   // headers stream.
   virtual size_t WriteHeaders(const SpdyHeaderBlock& header_block,