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

net/http/bidirectional_stream.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/http/bidirectional_stream.h"
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 41 matching lines @@
   std::unique_ptr<base::Value> headers_param(
       headers->NetLogCallback(&empty, capture_mode));
   dict->Set("headers", std::move(headers_param));
   return std::move(dict);
 }
 
 }  // namespace
 
 BidirectionalStream::Delegate::Delegate() {}
 
-void BidirectionalStream::Delegate::OnStreamReady() {}
-
 BidirectionalStream::Delegate::~Delegate() {}
 
 BidirectionalStream::BidirectionalStream(
     std::unique_ptr<BidirectionalStreamRequestInfo> request_info,
     HttpNetworkSession* session,
-    bool disable_auto_flush,
+    bool send_request_headers_automatically,
     Delegate* delegate)
     : BidirectionalStream(std::move(request_info),
                           session,
-                          disable_auto_flush,
+                          send_request_headers_automatically,
                           delegate,
                           base::WrapUnique(new base::Timer(false, false))) {}
 
 BidirectionalStream::BidirectionalStream(
     std::unique_ptr<BidirectionalStreamRequestInfo> request_info,
     HttpNetworkSession* session,
-    bool disable_auto_flush,
+    bool send_request_headers_automatically,
     Delegate* delegate,
     std::unique_ptr<base::Timer> timer)
     : request_info_(std::move(request_info)),
       net_log_(BoundNetLog::Make(session->net_log(),
                                  NetLog::SOURCE_BIDIRECTIONAL_STREAM)),
       session_(session),
-      disable_auto_flush_(disable_auto_flush),
+      send_request_headers_automatically_(send_request_headers_automatically),
+      request_headers_sent_(false),
       delegate_(delegate),
       timer_(std::move(timer)) {
   DCHECK(delegate_);
   DCHECK(request_info_);
 
   SSLConfig server_ssl_config;
   session->ssl_config_service()->GetSSLConfig(&server_ssl_config);
   session->GetAlpnProtos(&server_ssl_config.alpn_protos);
   session->GetNpnProtos(&server_ssl_config.npn_protos);
 
@@ skipping 26 matching lines @@
   }
 }
 
 BidirectionalStream::~BidirectionalStream() {
   Cancel();
   if (net_log_.IsCapturing()) {
     net_log_.EndEvent(NetLog::TYPE_BIDIRECTIONAL_STREAM_ALIVE);
   }
 }
 
+void BidirectionalStream::SendRequestHeaders() {
+  DCHECK(stream_impl_);
+  DCHECK(!request_headers_sent_);

[mef, 2016/06/01 21:33:21]

add DCHECK(!send_request_headers_automatically_);

[xunjieli, 2016/06/01 22:27:16]

Done.

+
+  stream_impl_->SendRequestHeaders();
+}
+
 int BidirectionalStream::ReadData(IOBuffer* buf, int buf_len) {
   DCHECK(stream_impl_);
 
   int rv = stream_impl_->ReadData(buf, buf_len);
   if (rv > 0) {
     net_log_.AddByteTransferEvent(
         NetLog::TYPE_BIDIRECTIONAL_STREAM_BYTES_RECEIVED, rv, buf->data());
   } else if (rv == ERR_IO_PENDING) {
     read_buffer_ = buf;
     // Bytes will be logged in OnDataRead().
@@ skipping 51 matching lines @@
   return stream_impl_->GetTotalReceivedBytes();
 }
 
 int64_t BidirectionalStream::GetTotalSentBytes() const {
   if (!stream_impl_)
     return 0;
 
   return stream_impl_->GetTotalSentBytes();
 }
 
-void BidirectionalStream::OnStreamReady() {
-  delegate_->OnStreamReady();
+void BidirectionalStream::OnStreamReady(bool request_headers_sent) {
+  request_headers_sent_ = request_headers_sent;
+  delegate_->OnStreamReady(request_headers_sent);
 }
 
 void BidirectionalStream::OnHeadersReceived(
     const SpdyHeaderBlock& response_headers) {
   HttpResponseInfo response_info;
   if (!SpdyHeadersToHttpResponse(response_headers, HTTP2, &response_info)) {
     DLOG(WARNING) << "Invalid headers";
     delegate_->OnFailed(ERR_FAILED);
     return;
   }
@@ skipping 54 matching lines @@
 }
 
 void BidirectionalStream::OnBidirectionalStreamImplReady(
     const SSLConfig& used_ssl_config,
     const ProxyInfo& used_proxy_info,
     BidirectionalStreamImpl* stream) {
   DCHECK(!stream_impl_);
 
   stream_request_.reset();
   stream_impl_.reset(stream);
-  stream_impl_->Start(request_info_.get(), net_log_, disable_auto_flush_, this,
+  stream_impl_->Start(request_info_.get(), net_log_,
+                      send_request_headers_automatically_, this,
                       std::move(timer_));
 }
 
 void BidirectionalStream::OnWebSocketHandshakeStreamReady(
     const SSLConfig& used_ssl_config,
     const ProxyInfo& used_proxy_info,
     WebSocketHandshakeStreamBase* stream) {
   NOTREACHED();
 }
 
@@ skipping 40 matching lines @@
     const ProxyInfo& used_proxy_info,
     HttpStream* stream) {
   DCHECK(stream_request_);
 
   delegate_->OnFailed(ERR_HTTPS_PROXY_TUNNEL_RESPONSE);
 }
 
 void BidirectionalStream::OnQuicBroken() {}
 
 }  // namespace net