[Cronet] Make delaying sending request headers explicit in bidirectional stream

net/spdy/bidirectional_stream_spdy_impl.cc

 // Copyright 2015 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/spdy/bidirectional_stream_spdy_impl.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/time/time.h"
@@ skipping 20 matching lines @@
     : spdy_session_(spdy_session),
       request_info_(nullptr),
       delegate_(nullptr),
       negotiated_protocol_(kProtoUnknown),
       more_read_data_pending_(false),
       read_buffer_len_(0),
       stream_closed_(false),
       closed_stream_status_(ERR_FAILED),
       closed_stream_received_bytes_(0),
       closed_stream_sent_bytes_(0),
-      disable_auto_flush_(false),
       weak_factory_(this) {}
 
 BidirectionalStreamSpdyImpl::~BidirectionalStreamSpdyImpl() {
   if (stream_) {
     stream_->DetachDelegate();
     DCHECK(!stream_);
   }
 }
 
 void BidirectionalStreamSpdyImpl::Start(
     const BidirectionalStreamRequestInfo* request_info,
     const BoundNetLog& net_log,
-    bool disable_auto_flush,
+    bool /*delay_headers_until_next_send_data*/,
     BidirectionalStreamImpl::Delegate* delegate,
     std::unique_ptr<base::Timer> timer) {
   DCHECK(!stream_);
   DCHECK(timer);
 
-  disable_auto_flush_ = disable_auto_flush;
   delegate_ = delegate;
   timer_ = std::move(timer);
 
   if (!spdy_session_) {
     delegate_->OnFailed(ERR_CONNECTION_CLOSED);
     return;
   }
 
   request_info_ = request_info;
 
@@ skipping 25 matching lines @@
   read_buffer_ = buf;
   read_buffer_len_ = buf_len;
   return ERR_IO_PENDING;
 }
 
 void BidirectionalStreamSpdyImpl::SendData(const scoped_refptr<IOBuffer>& data,
                                            int length,
                                            bool end_stream) {
   DCHECK(!stream_closed_);
   DCHECK(stream_);
-  DCHECK(!disable_auto_flush_);
 
   stream_->SendData(data.get(), length,
                     end_stream ? NO_MORE_DATA_TO_SEND : MORE_DATA_TO_SEND);
 }
 
 void BidirectionalStreamSpdyImpl::SendvData(
     const std::vector<scoped_refptr<IOBuffer>>& buffers,
     const std::vector<int>& lengths,
     bool end_stream) {
   DCHECK(!stream_closed_);
   DCHECK(stream_);
-  DCHECK(disable_auto_flush_);
   DCHECK_EQ(buffers.size(), lengths.size());
 
   int total_len = 0;
   for (int len : lengths) {
     total_len += len;
   }
 
   pending_combined_buffer_ = new net::IOBuffer(total_len);
   int len = 0;
   // TODO(xunjieli): Get rid of extra copy. Coalesce headers and data frames.
@@ skipping 69 matching lines @@
     // Handing small chunks of data to the caller creates measurable overhead.
     // So buffer data in short time-spans and send a single read notification.
     ScheduleBufferedRead();
   }
 }
 
 void BidirectionalStreamSpdyImpl::OnDataSent() {
   DCHECK(stream_);
   DCHECK(!stream_closed_);
 
-  if (disable_auto_flush_) {
-    DCHECK(pending_combined_buffer_);
-    pending_combined_buffer_ = nullptr;
-  }
+  pending_combined_buffer_ = nullptr;
   delegate_->OnDataSent();
 }
 
 void BidirectionalStreamSpdyImpl::OnTrailers(const SpdyHeaderBlock& trailers) {
   DCHECK(stream_);
   DCHECK(!stream_closed_);
 
   delegate_->OnTrailersReceived(trailers);
 }
 
@@ skipping 84 matching lines @@
 
 bool BidirectionalStreamSpdyImpl::ShouldWaitForMoreBufferedData() const {
   if (stream_closed_)
     return false;
   DCHECK_GT(read_buffer_len_, 0);
   return read_data_queue_.GetTotalSize() <
          static_cast<size_t>(read_buffer_len_);
 }
 
 }  // namespace net