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

net/spdy/bidirectional_stream_spdy_impl.cc

Index: net/spdy/bidirectional_stream_spdy_impl.cc
diff --git a/net/spdy/bidirectional_stream_spdy_impl.cc b/net/spdy/bidirectional_stream_spdy_impl.cc
index 42341ee5411e371f1391d9c55762dd99db03c0f7..3df8388cbb8e83bb7f4dab95770479dcacb27b26 100644
--- a/net/spdy/bidirectional_stream_spdy_impl.cc
+++ b/net/spdy/bidirectional_stream_spdy_impl.cc
@@ -38,7 +38,6 @@ BidirectionalStreamSpdyImpl::BidirectionalStreamSpdyImpl(
       closed_stream_status_(ERR_FAILED),
       closed_stream_received_bytes_(0),
       closed_stream_sent_bytes_(0),
-      disable_auto_flush_(false),
       weak_factory_(this) {}
 
 BidirectionalStreamSpdyImpl::~BidirectionalStreamSpdyImpl() {
@@ -51,13 +50,12 @@ BidirectionalStreamSpdyImpl::~BidirectionalStreamSpdyImpl() {
 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);
 
@@ -103,7 +101,6 @@ void BidirectionalStreamSpdyImpl::SendData(const scoped_refptr<IOBuffer>& data,
                                            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);
@@ -115,7 +112,6 @@ void BidirectionalStreamSpdyImpl::SendvData(
     bool end_stream) {
   DCHECK(!stream_closed_);
   DCHECK(stream_);
-  DCHECK(disable_auto_flush_);
   DCHECK_EQ(buffers.size(), lengths.size());
 
   int total_len = 0;
@@ -205,10 +201,7 @@ 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();
 }