Remove OnDataAvailable() notification when trailers are to be delivered

net/quic/core/quic_spdy_stream.cc

Index: net/quic/core/quic_spdy_stream.cc
diff --git a/net/quic/core/quic_spdy_stream.cc b/net/quic/core/quic_spdy_stream.cc
index 0747b8e44e45aad8302fc3f369eaff6a823e435d..cc33d36c49a5f44e5880e0138253fdd92c28b453 100644
--- a/net/quic/core/quic_spdy_stream.cc
+++ b/net/quic/core/quic_spdy_stream.cc
@@ -293,9 +293,8 @@ void QuicSpdyStream::OnTrailingHeadersComplete(bool fin, size_t /*frame_len*/) {
   // The data on this stream ends at |final_byte_offset|.
   DVLOG(1) << "Stream ends at byte offset: " << final_byte_offset
            << "  currently read: " << stream_bytes_read();
-
-  OnStreamFrame(QuicStreamFrame(id(), fin, final_byte_offset, StringPiece()));
   trailers_decompressed_ = true;

[xunjieli, 2016/10/05 17:47:19]

This line (and the line below) is moved above OnStreamFrame() so
FinishedReadingTrailers() can correctly report that we are waiting for trailers.

+  OnStreamFrame(QuicStreamFrame(id(), fin, final_byte_offset, StringPiece()));
 }
 
 void QuicSpdyStream::OnTrailingHeadersComplete(
@@ -327,8 +326,8 @@ void QuicSpdyStream::OnTrailingHeadersComplete(
         ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
     return;
   }
-  OnStreamFrame(QuicStreamFrame(id(), fin, final_byte_offset, StringPiece()));
   trailers_decompressed_ = true;
+  OnStreamFrame(QuicStreamFrame(id(), fin, final_byte_offset, StringPiece()));
 }
 
 void QuicSpdyStream::OnStreamReset(const QuicRstStreamFrame& frame) {