QuicChromiumClientStream should only do OnStream after notifying delegate about trailers

net/quic/quic_spdy_stream.cc

 // Copyright 2013 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.
 
 #include "net/quic/quic_spdy_stream.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_bug_tracker.h"
 #include "net/quic/quic_spdy_session.h"
@@ skipping 195 matching lines @@
         QUIC_INVALID_HEADERS_STREAM_DATA, "Trailers after fin");
     return;
   }
   if (!fin) {
     DLOG(ERROR) << "Trailers must have FIN set, on stream: " << id();
     session()->connection()->SendConnectionCloseWithDetails(
         QUIC_INVALID_HEADERS_STREAM_DATA, "Fin missing from trailers");
     return;
   }
 
-  OnStreamFrame(QuicStreamFrame(id(), fin, stream_bytes_read(), StringPiece()));

[Ryan Hamilton, 2016/03/08 04:12:43]

I thought that you and robbie agreed that this was the right place for this
change?

Did you ever merge this back to google3?

[xunjieli, 2016/03/08 14:46:02]

Robbie and I agreed that we need to add a OnStreamFrame. However, if we put
OnStreamFrame here, it will call OnDataAvailable with Fin flag before we notify
delegate of trailers. This isn't correct, because once delegate consumes FIN
flag, it thinks that everything is done. (The code is fine for initial headers,
because there's some logic to block the sequencer, so we delay OnDataAvailable
until the initial headers). 

This is discovered when I did more testing.

Sorry, I thought you'd help me with merging with Google3, so I didn't do
anything. Could you help me?

   trailers_decompressed_ = true;
 }
 
 void QuicSpdyStream::OnStreamReset(const QuicRstStreamFrame& frame) {
   if (frame.error_code != QUIC_STREAM_NO_ERROR ||
       version() <= QUIC_VERSION_28) {
     ReliableQuicStream::OnStreamReset(frame);
     return;
   }
   DVLOG(1) << "Received QUIC_STREAM_NO_ERROR, not discarding response";
@@ skipping 23 matching lines @@
   // If no further trailing headers are expected, and the decompressed trailers
   // (if any) have been consumed, then reading of trailers is finished.
   bool no_more_trailers = fin_received() || trailers_decompressed_;
   return no_more_trailers && decompressed_trailers_.empty();
 }
 
 SpdyPriority QuicSpdyStream::priority() const {
   return priority_;
 }
 }  // namespace net