QuicChromiumClientStream should only do OnStream after notifying delegate about trailers

net/quic/quic_chromium_client_stream.cc

 // 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.
 
 #include "net/quic/quic_chromium_client_stream.h"
 
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/base/io_buffer.h"
@@ skipping 40 matching lines @@
   }
   if (!framer.ParseHeaderBlockInBuffer(header_data, headers_len, &headers)) {
     DLOG(WARNING) << "Invalid headers";
     Reset(QUIC_BAD_APPLICATION_PAYLOAD);
     return;
   }
 
   if (!headers_delivered_) {
     MarkHeadersConsumed(headers_len);
     session_->OnInitialHeadersComplete(id(), headers);
+    // The delegate will read the headers via a posted task.
+    NotifyDelegateOfHeadersCompleteLater(headers, frame_len);
   } else {
     MarkTrailersConsumed(headers_len);
+    NotifyDelegateOfHeadersCompleteLater(headers, frame_len);
+    OnStreamFrame(
+        QuicStreamFrame(id(), fin, stream_bytes_read(), StringPiece()));
   }
-
-  // The delegate will read the headers via a posted task.
-  NotifyDelegateOfHeadersCompleteLater(headers, frame_len);
 }
 
 void QuicChromiumClientStream::OnPromiseHeadersComplete(
     QuicStreamId promised_id,
     size_t frame_len) {
   size_t headers_len = decompressed_headers().length();
   SpdyHeaderBlock headers;
   SpdyFramer framer(HTTP2);
   if (!framer.ParseHeaderBlockInBuffer(decompressed_headers().data(),
                                        headers_len, &headers)) {
@@ skipping 134 matching lines @@
 
 void QuicChromiumClientStream::RunOrBuffer(base::Closure closure) {
   if (delegate_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, closure);
   } else {
     delegate_tasks_.push_back(closure);
   }
 }
 
 }  // namespace net