Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

net/tools/quic/quic_spdy_client_stream.h

Index: net/tools/quic/quic_spdy_client_stream.h
diff --git a/net/tools/quic/quic_spdy_client_stream.h b/net/tools/quic/quic_spdy_client_stream.h
index 702c8ba9bdc486d35e760c2b745e67f82953d82f..179de25c9c2f336b7a9fe9c716e53860b5e76ec5 100644
--- a/net/tools/quic/quic_spdy_client_stream.h
+++ b/net/tools/quic/quic_spdy_client_stream.h
@@ -46,8 +46,7 @@ class QuicSpdyClientStream : public QuicSpdyStream {
                            size_t frame_len,
                            const QuicHeaderList& header_list) override;
 
-  // ReliableQuicStream implementation called by the session when there's
-  // data for us.
+  // QuicStream implementation called by the session when there's data for us.
   void OnDataAvailable() override;
 
   // Serializes the headers and body, sends it to the server, and
@@ -64,8 +63,6 @@ class QuicSpdyClientStream : public QuicSpdyStream {
 
   size_t header_bytes_written() const { return header_bytes_written_; }
 
-  size_t trailer_bytes_read() const { return header_bytes_read_; }
-
   int response_code() const { return response_code_; }
 
   // While the server's SetPriority shouldn't be called externally, the creator