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

components/cronet/android/cronet_bidirectional_stream_adapter.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 "cronet_bidirectional_stream_adapter.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 53 matching lines @@
   // Reset global references.
   jwrite_buffer_list.Reset();
   jwrite_buffer_pos_list.Reset();
   jwrite_buffer_limit_list.Reset();
 }
 
 static jlong CreateBidirectionalStream(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jbidi_stream,
     jlong jurl_request_context_adapter,
-    jboolean jdisable_auto_flush) {
+    jboolean jdelay_headers_until_next_send_data) {
   CronetURLRequestContextAdapter* context_adapter =
       reinterpret_cast<CronetURLRequestContextAdapter*>(
           jurl_request_context_adapter);
   DCHECK(context_adapter);
 
   CronetBidirectionalStreamAdapter* adapter =
       new CronetBidirectionalStreamAdapter(context_adapter, env, jbidi_stream,
-                                           jdisable_auto_flush);
+                                           jdelay_headers_until_next_send_data);
 
   return reinterpret_cast<jlong>(adapter);
 }
 
 // static
 bool CronetBidirectionalStreamAdapter::RegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 CronetBidirectionalStreamAdapter::CronetBidirectionalStreamAdapter(
     CronetURLRequestContextAdapter* context,
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jbidi_stream,
-    bool disable_auto_flush)
+    bool delay_headers_until_next_send_data)
     : context_(context),
       owner_(env, jbidi_stream),
-      disable_auto_flush_(disable_auto_flush),
+      delay_headers_until_next_send_data_(delay_headers_until_next_send_data),
       stream_failed_(false) {}
 
 CronetBidirectionalStreamAdapter::~CronetBidirectionalStreamAdapter() {
   DCHECK(context_->IsOnNetworkThread());
 }
 
 jint CronetBidirectionalStreamAdapter::Start(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller,
     const base::android::JavaParamRef<jstring>& jurl,
@@ skipping 204 matching lines @@
   DCHECK(context_->IsOnNetworkThread());
   DCHECK(!bidi_stream_);
   request_info->extra_headers.SetHeaderIfMissing(
       net::HttpRequestHeaders::kUserAgent, context_->GetURLRequestContext()
                                                ->http_user_agent_settings()
                                                ->GetUserAgent());
   bidi_stream_.reset(new net::BidirectionalStream(
       std::move(request_info), context_->GetURLRequestContext()
                                    ->http_transaction_factory()
                                    ->GetSession(),
-      disable_auto_flush_, this));
+      delay_headers_until_next_send_data_, this));
 }
 
 void CronetBidirectionalStreamAdapter::ReadDataOnNetworkThread(
     scoped_refptr<IOBufferWithByteBuffer> read_buffer,
     int buffer_size) {
   DCHECK(context_->IsOnNetworkThread());
   DCHECK(read_buffer);
   DCHECK(!read_buffer_);
 
   read_buffer_ = read_buffer;
@@ skipping 56 matching lines @@
 
   std::vector<std::string> headers;
   for (const auto& header : header_block) {
     headers.push_back(header.first.as_string());
     headers.push_back(header.second.as_string());
   }
   return base::android::ToJavaArrayOfStrings(env, headers);
 }
 
 }  // namespace cronet