Remove OnDataAvailable() notification when trailers are to be delivered

net/quic/chromium/bidirectional_stream_quic_impl.cc

 // Copyright 2016 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/chromium/bidirectional_stream_quic_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 228 matching lines @@
     has_received_headers_ = true;
     connect_timing_ = session_->GetConnectTiming();
     if (delegate_)
       delegate_->OnHeadersReceived(headers);
   } else {
     if (stream_->IsDoneReading()) {
       // If the write side is closed, OnFinRead() will call
       // BidirectionalStreamQuicImpl::OnClose().
       stream_->OnFinRead();
     }
-    if (delegate_)
-      delegate_->OnTrailersReceived(headers);
+    if (!delegate_)
+      return;
+    // Complete any remaining read. The task is posted because
+    // |delegate_|->OnTrailersReceived() might destroy |this|.
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, base::Bind(&BidirectionalStreamQuicImpl::OnDataAvailable,
+                              weak_factory_.GetWeakPtr()));
+    delegate_->OnTrailersReceived(headers);
+    // |this| can be destroyed after this point.
   }
 }
 
 void BidirectionalStreamQuicImpl::OnDataAvailable() {
   // Return early if ReadData has not been called.
   if (!read_buffer_)
     return;
 
-  CHECK(read_buffer_);
-  CHECK_NE(0, read_buffer_len_);
+  DCHECK(read_buffer_);

[kapishnikov, 2016/10/05 21:05:08]

Can we remove this DCHECK? The previous 'if' statement guarantees that
read_buffer_ is not null.

[xunjieli, 2016/10/05 21:56:28]

Done. Ah, you are right. Not sure why I added those..

+  DCHECK_NE(0, read_buffer_len_);
   int rv = ReadData(read_buffer_.get(), read_buffer_len_);
   if (rv == ERR_IO_PENDING) {
     // Spurrious notification. Wait for the next one.
     return;
   }
   read_buffer_ = nullptr;
   read_buffer_len_ = 0;
   if (delegate_)
     delegate_->OnDataRead(rv);
 }
@@ skipping 85 matching lines @@
   if (!stream_)
     return;
   closed_stream_received_bytes_ = stream_->stream_bytes_read();
   closed_stream_sent_bytes_ = stream_->stream_bytes_written();
   closed_is_first_stream_ = stream_->IsFirstStream();
   stream_->SetDelegate(nullptr);
   stream_ = nullptr;
 }
 
 }  // namespace net