[Cronet] Coalesce small buffers into single QUIC packet in GRPC on iOS.

components/cronet/ios/test/cronet_bidirectional_stream_test.mm

 // 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.
 
 #import <Foundation/Foundation.h>
 #include <stdint.h>
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/cronet/ios/cronet_c_for_grpc.h"
 #include "components/cronet/ios/cronet_environment.h"
 #include "components/cronet/ios/test/quic_test_server.h"
 #include "net/base/mac/url_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "url/gurl.h"
 
 namespace {
 
 cronet_bidirectional_stream_header kTestHeaders[] = {
     {"header1", "foo"},
     {"header2", "bar"},
 };
 const cronet_bidirectional_stream_header_array kTestHeadersArray = {
     2, 2, kTestHeaders};
 }  // namespace
 
 namespace cronet {
 
-class CronetBidirectionalStreamTest : public ::testing::Test {
+class CronetBidirectionalStreamTest : public ::testing::TestWithParam<bool> {
  protected:
   CronetBidirectionalStreamTest() {}
   ~CronetBidirectionalStreamTest() override {}
 
   void SetUp() override {
     static bool initialized = false;
     if (!initialized) {
       initialized = true;
       // Hack to work around issues with SetUp being called multiple times
       // during the test, and QuicTestServer not shutting down / restarting
       // gracefully.
       CronetEnvironment::Initialize();
+      cronet_environment_ = new CronetEnvironment("CronetTest/1.0.0.0");
+      cronet_environment_->set_http2_enabled(true);
+      cronet_environment_->set_quic_enabled(true);
+      cronet_environment_->set_ssl_key_log_file_name("SSLKEYLOGFILE");
+
+      std::unique_ptr<net::MockCertVerifier> mock_cert_verifier(
+          new net::MockCertVerifier());
+      mock_cert_verifier->set_default_result(net::OK);
+
+      cronet_environment_->set_cert_verifier(std::move(mock_cert_verifier));
+      cronet_environment_->set_host_resolver_rules(
+          "MAP test.example.com 127.0.0.1,"
+          "MAP notfound.example.com ~NOTFOUND");
+      cronet_environment_->AddQuicHint(kTestServerDomain, kTestServerPort,
+                                       kTestServerPort);
+
+      cronet_environment_->Start();
+
+      cronet_engine_.obj = cronet_environment_;
     }
 
     StartQuicTestServer();
-
-    cronet_environment_ = new CronetEnvironment("CronetTest/1.0.0.0");
-    cronet_environment_->set_http2_enabled(true);
-    cronet_environment_->set_quic_enabled(true);
-    cronet_environment_->set_ssl_key_log_file_name("SSLKEYLOGFILE");
-
-    std::unique_ptr<net::MockCertVerifier> mock_cert_verifier(
-        new net::MockCertVerifier());
-    mock_cert_verifier->set_default_result(net::OK);
-
-    cronet_environment_->set_cert_verifier(std::move(mock_cert_verifier));
-    cronet_environment_->set_host_resolver_rules(
-        "MAP test.example.com 127.0.0.1,"
-        "MAP notfound.example.com ~NOTFOUND");
-    cronet_environment_->AddQuicHint(kTestServerDomain, kTestServerPort,
-                                     kTestServerPort);
-
-    cronet_environment_->Start();
-
-    cronet_engine_.obj = cronet_environment_;
-
     cronet_environment_->StartNetLog("cronet_netlog.json", true);
   }
 
   void TearDown() override {
     ShutdownQuicTestServer();
     cronet_environment_->StopNetLog();
-    //[CronetEngine stopNetLog];
-    //[CronetEngine uninstall];
   }
 
   cronet_engine* engine() { return &cronet_engine_; }
 
  private:
   static CronetEnvironment* cronet_environment_;
   static cronet_engine cronet_engine_;
 };
 
-CronetEnvironment* CronetBidirectionalStreamTest::cronet_environment_;
-cronet_engine CronetBidirectionalStreamTest::cronet_engine_;
+CronetEnvironment* CronetBidirectionalStreamTest::cronet_environment_ = nullptr;
+cronet_engine CronetBidirectionalStreamTest::cronet_engine_ = {0};
 
 class TestBidirectionalStreamCallback {
  public:
   enum ResponseStep {
     NOTHING,
     ON_STREAM_READY,
     ON_RESPONSE_STARTED,
     ON_READ_COMPLETED,
     ON_WRITE_COMPLETED,
     ON_TRAILERS,
     ON_CANCELED,
     ON_FAILED,
     ON_SUCCEEDED
   };
 
+  struct WriteData {
+    std::string buffer;
+    bool flush;

[xunjieli, 2016/06/14 14:29:35]

Maybe add a brief comment on what |flush| is.

[mef, 2016/06/14 19:54:31]

Done.

+
+    WriteData(const std::string& buffer, bool flush);
+    ~WriteData();
+
+    DISALLOW_COPY_AND_ASSIGN(WriteData);

[xunjieli, 2016/06/14 14:29:35]

include macros.h?

[mef, 2016/06/14 19:54:30]

Done.

+  };
+
   cronet_bidirectional_stream* stream;
   base::WaitableEvent stream_done_event;
 
   // Test parameters.
   std::map<std::string, std::string> request_headers;
-  std::list<std::string> write_data;
+  std::list<std::unique_ptr<WriteData>> write_data;
   std::string expected_negotiated_protocol;
   ResponseStep cancel_from_step;
   size_t read_buffer_size;
 
   // Test results.
   ResponseStep response_step;
   char* read_buffer;
   std::map<std::string, std::string> response_headers;
   std::map<std::string, std::string> response_trailers;
   std::vector<std::string> read_data;
@@ skipping 31 matching lines @@
       return false;
 
     cronet_bidirectional_stream_cancel(stream);
     return true;
   }
 
   void SignalDone() { stream_done_event.Signal(); }
 
   void BlockForDone() { stream_done_event.Wait(); }
 
-  void AddWriteData(const std::string& data) { write_data.push_back(data); }
+  void AddWriteData(const std::string& data) { AddWriteData(data, true); }
+  void AddWriteData(const std::string& data, bool flush) {
+    write_data.push_back(base::WrapUnique(new WriteData(data, flush)));
+  }
 
   virtual void MaybeWriteNextData(cronet_bidirectional_stream* stream) {
     DCHECK_EQ(stream, this->stream);
     if (write_data.empty())
       return;
-    cronet_bidirectional_stream_write(stream, write_data.front().c_str(),
-                                      write_data.front().size(),
-                                      write_data.size() == 1);
+    for (const auto& data : write_data) {
+      cronet_bidirectional_stream_write(stream, data->buffer.c_str(),
+                                        data->buffer.size(),
+                                        data == write_data.back());
+      if (data->flush) {
+        cronet_bidirectional_stream_flush(stream);
+        break;
+      }
+    }
   }
 
   cronet_bidirectional_stream_callback* callback() const { return &s_callback; }
 
  private:
   // C callbacks.
   static void on_stream_ready_callback(cronet_bidirectional_stream* stream) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
     if (test->MaybeCancel(stream, ON_STREAM_READY))
       return;
@@ skipping 27 matching lines @@
       return;
     if (count == 0)
       return;
     cronet_bidirectional_stream_read(stream, test->read_buffer,
                                      test->read_buffer_size);
   }
 
   static void on_write_completed_callback(cronet_bidirectional_stream* stream,
                                           const char* data) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
-    ASSERT_EQ(test->write_data.front().c_str(), data);
+    ASSERT_EQ(test->write_data.front()->buffer.c_str(), data);
     if (test->MaybeCancel(stream, ON_WRITE_COMPLETED))
       return;
+    bool continue_writing = test->write_data.front()->flush;
     test->write_data.pop_front();

[xunjieli, 2016/06/14 14:29:35]

Suggest that we also check |data| is the same as the write data that is in front
of the queue.

[mef, 2016/06/14 19:54:31]

Hrm, is it different than ASSERT_EQ(test->write_data.front()->buffer.c_str(),
data); above?

[xunjieli, 2016/06/14 19:56:12]

Acknowledged. Sorry, I missed that part.

-    test->MaybeWriteNextData(stream);
+    if (continue_writing)
+      test->MaybeWriteNextData(stream);
   }
 
   static void on_response_trailers_received_callback(
       cronet_bidirectional_stream* stream,
       const cronet_bidirectional_stream_header_array* trailers) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
     for (size_t i = 0; i < trailers->count; ++i) {
       test->response_trailers[trailers->headers[i].key] =
           trailers->headers[i].value;
     }
 
     if (test->MaybeCancel(stream, ON_TRAILERS))
       return;
   }
 
   static void on_succeded_callback(cronet_bidirectional_stream* stream) {

[xunjieli, 2016/06/14 14:29:35]

maybe check test->write_data is now empty (we have received all
on_write_completed callbacks).

[mef, 2016/06/14 19:54:31]

Done.

     TestBidirectionalStreamCallback* test = FromStream(stream);
     test->MaybeCancel(stream, ON_SUCCEEDED);
     test->SignalDone();
   }
 
   static void on_failed_callback(cronet_bidirectional_stream* stream,
                                  int net_error) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
     test->net_error = net_error;
     test->MaybeCancel(stream, ON_FAILED);
@@ skipping 13 matching lines @@
     TestBidirectionalStreamCallback::s_callback = {
         on_stream_ready_callback,
         on_response_headers_received_callback,
         on_read_completed_callback,
         on_write_completed_callback,
         on_response_trailers_received_callback,
         on_succeded_callback,
         on_failed_callback,
         on_canceled_callback};
 
-TEST_F(CronetBidirectionalStreamTest, StartExampleBidiStream) {
+TestBidirectionalStreamCallback::WriteData::WriteData(const std::string& data,
+                                                      bool flush_after)
+    : buffer(data), flush(flush_after) {}
+
+TestBidirectionalStreamCallback::WriteData::~WriteData() {}
+
+TEST_P(CronetBidirectionalStreamTest, StartExampleBidiStream) {
   TestBidirectionalStreamCallback test;
   test.AddWriteData("Hello, ");
   test.AddWriteData("world!");
   test.read_buffer_size = 2;
   test.stream =
       cronet_bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
   cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "POST",
                                     &kTestHeadersArray, false);
   test.BlockForDone();
   ASSERT_EQ(std::string(kHelloStatus), test.response_headers[kStatusHeader]);
   ASSERT_EQ(std::string(kHelloHeaderValue),
             test.response_headers[kHelloHeaderName]);
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_SUCCEEDED, test.response_step);
   ASSERT_EQ(std::string(kHelloBodyValue, 2), test.read_data.front());
   ASSERT_EQ(std::string(kHelloBodyValue), base::JoinString(test.read_data, ""));
   ASSERT_EQ(std::string(kHelloTrailerValue),
             test.response_trailers[kHelloTrailerName]);
   cronet_bidirectional_stream_destroy(test.stream);
 }
 
-TEST_F(CronetBidirectionalStreamTest, CancelOnRead) {
+TEST_P(CronetBidirectionalStreamTest, SimpleGetWithFlush) {
   TestBidirectionalStreamCallback test;
   test.stream =
       cronet_bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
+  cronet_bidirectional_stream_disable_auto_flush(test.stream, true);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
+  // Flush before start is ignored.
+  cronet_bidirectional_stream_flush(test.stream);
+  cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "GET",
+                                    &kTestHeadersArray, true);
+  test.BlockForDone();
+  ASSERT_EQ(std::string(kHelloStatus), test.response_headers[kStatusHeader]);
+  ASSERT_EQ(std::string(kHelloHeaderValue),
+            test.response_headers[kHelloHeaderName]);
+  ASSERT_EQ(TestBidirectionalStreamCallback::ON_SUCCEEDED, test.response_step);
+  ASSERT_EQ(std::string(kHelloBodyValue), base::JoinString(test.read_data, ""));
+  ASSERT_EQ(std::string(kHelloTrailerValue),
+            test.response_trailers[kHelloTrailerName]);
+  // Flush after done is ignored.
+  cronet_bidirectional_stream_flush(test.stream);
+  cronet_bidirectional_stream_destroy(test.stream);
+}
+
+TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlush) {
+  TestBidirectionalStreamCallback test;
+  test.AddWriteData("Test String", false);
+  test.AddWriteData("1234567890", false);
+  test.AddWriteData("woot!", true);
+  test.stream =
+      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  DCHECK(test.stream);
+  cronet_bidirectional_stream_disable_auto_flush(test.stream, true);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
+  // Flush before start is ignored.
+  cronet_bidirectional_stream_flush(test.stream);
+  cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "POST",
+                                    &kTestHeadersArray, false);
+  test.BlockForDone();
+  ASSERT_EQ(std::string(kHelloStatus), test.response_headers[kStatusHeader]);
+  ASSERT_EQ(std::string(kHelloHeaderValue),
+            test.response_headers[kHelloHeaderName]);
+  ASSERT_EQ(TestBidirectionalStreamCallback::ON_SUCCEEDED, test.response_step);
+  ASSERT_EQ(std::string(kHelloBodyValue), base::JoinString(test.read_data, ""));
+  ASSERT_EQ(std::string(kHelloTrailerValue),
+            test.response_trailers[kHelloTrailerName]);
+  // Flush after done is ignored.
+  cronet_bidirectional_stream_flush(test.stream);
+  cronet_bidirectional_stream_destroy(test.stream);
+}
+
+TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlushTwice) {
+  TestBidirectionalStreamCallback test;
+  test.AddWriteData("Test String", false);
+  test.AddWriteData("1234567890", false);
+  test.AddWriteData("woot!", true);
+  test.AddWriteData("Test String", false);
+  test.AddWriteData("1234567890", false);
+  test.AddWriteData("woot!", true);
+  test.stream =
+      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  DCHECK(test.stream);
+  cronet_bidirectional_stream_disable_auto_flush(test.stream, true);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
+  // Flush before start is ignored.
+  cronet_bidirectional_stream_flush(test.stream);
+  cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "POST",
+                                    &kTestHeadersArray, false);
+  test.BlockForDone();
+  ASSERT_EQ(std::string(kHelloStatus), test.response_headers[kStatusHeader]);
+  ASSERT_EQ(std::string(kHelloHeaderValue),
+            test.response_headers[kHelloHeaderName]);
+  ASSERT_EQ(TestBidirectionalStreamCallback::ON_SUCCEEDED, test.response_step);
+  ASSERT_EQ(std::string(kHelloBodyValue), base::JoinString(test.read_data, ""));
+  ASSERT_EQ(std::string(kHelloTrailerValue),
+            test.response_trailers[kHelloTrailerName]);
+  // Flush after done is ignored.
+  cronet_bidirectional_stream_flush(test.stream);
+  cronet_bidirectional_stream_destroy(test.stream);
+}
+
+TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlushAfterOneWrite) {
+  TestBidirectionalStreamCallback test;
+  test.AddWriteData("Test String", false);
+  test.AddWriteData("1234567890", false);
+  test.AddWriteData("woot!", true);
+  test.stream =
+      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  DCHECK(test.stream);
+  cronet_bidirectional_stream_disable_auto_flush(test.stream, true);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
+  // Flush before start is ignored.
+  cronet_bidirectional_stream_flush(test.stream);
+  cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "POST",
+                                    &kTestHeadersArray, false);
+  test.BlockForDone();
+  ASSERT_EQ(std::string(kHelloStatus), test.response_headers[kStatusHeader]);
+  ASSERT_EQ(std::string(kHelloHeaderValue),
+            test.response_headers[kHelloHeaderName]);
+  ASSERT_EQ(TestBidirectionalStreamCallback::ON_SUCCEEDED, test.response_step);
+  ASSERT_EQ(std::string(kHelloBodyValue), base::JoinString(test.read_data, ""));
+  ASSERT_EQ(std::string(kHelloTrailerValue),
+            test.response_trailers[kHelloTrailerName]);
+  // Flush after done is ignored.
+  cronet_bidirectional_stream_flush(test.stream);
+  cronet_bidirectional_stream_destroy(test.stream);
+}
+
+TEST_P(CronetBidirectionalStreamTest, CancelOnRead) {
+  TestBidirectionalStreamCallback test;
+  test.stream =
+      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  DCHECK(test.stream);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
   test.cancel_from_step = TestBidirectionalStreamCallback::ON_READ_COMPLETED;
   cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "POST",
                                     &kTestHeadersArray, true);
   test.BlockForDone();
   ASSERT_EQ(std::string(kHelloStatus), test.response_headers[kStatusHeader]);
   ASSERT_EQ(std::string(kHelloBodyValue), test.read_data.front());
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_CANCELED, test.response_step);
   cronet_bidirectional_stream_destroy(test.stream);
 }
 
-TEST_F(CronetBidirectionalStreamTest, CancelOnResponse) {
+TEST_P(CronetBidirectionalStreamTest, CancelOnResponse) {
   TestBidirectionalStreamCallback test;
   test.stream =
       cronet_bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
   test.cancel_from_step = TestBidirectionalStreamCallback::ON_RESPONSE_STARTED;
   cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "POST",
                                     &kTestHeadersArray, true);
   test.BlockForDone();
   ASSERT_EQ(std::string(kHelloStatus), test.response_headers[kStatusHeader]);
   ASSERT_TRUE(test.read_data.empty());
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_CANCELED, test.response_step);
   cronet_bidirectional_stream_destroy(test.stream);
 }
 
-TEST_F(CronetBidirectionalStreamTest, CancelOnSucceeded) {
+TEST_P(CronetBidirectionalStreamTest, CancelOnSucceeded) {
   TestBidirectionalStreamCallback test;
   test.stream =
       cronet_bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
   test.cancel_from_step = TestBidirectionalStreamCallback::ON_SUCCEEDED;
   cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "POST",
                                     &kTestHeadersArray, true);
   test.BlockForDone();
   ASSERT_EQ(std::string(kHelloStatus), test.response_headers[kStatusHeader]);
   ASSERT_EQ(std::string(kHelloBodyValue), test.read_data.front());
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_SUCCEEDED, test.response_step);
   cronet_bidirectional_stream_destroy(test.stream);
 }
 
-TEST_F(CronetBidirectionalStreamTest, ReadFailsBeforeRequestStarted) {
+TEST_P(CronetBidirectionalStreamTest, ReadFailsBeforeRequestStarted) {
   TestBidirectionalStreamCallback test;
   test.stream =
       cronet_bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
   char read_buffer[1];
   cronet_bidirectional_stream_read(test.stream, read_buffer,
                                    sizeof(read_buffer));
   test.BlockForDone();
   ASSERT_TRUE(test.read_data.empty());
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_FAILED, test.response_step);
   ASSERT_EQ(net::ERR_UNEXPECTED, test.net_error);
   cronet_bidirectional_stream_destroy(test.stream);
 }
 
-TEST_F(CronetBidirectionalStreamTest,
+TEST_P(CronetBidirectionalStreamTest,
        StreamFailBeforeReadIsExecutedOnNetworkThread) {
   class CustomTestBidirectionalStreamCallback
       : public TestBidirectionalStreamCallback {
     bool MaybeCancel(cronet_bidirectional_stream* stream,
                      ResponseStep step) override {
       if (step == ResponseStep::ON_READ_COMPLETED) {
         // Shut down the server, and the stream should error out.
         // The second call to ShutdownQuicTestServer is no-op.
         ShutdownQuicTestServer();
       }
       return TestBidirectionalStreamCallback::MaybeCancel(stream, step);
     }
   };
 
   CustomTestBidirectionalStreamCallback test;
   test.AddWriteData("Hello, ");
   test.AddWriteData("world!");
   test.read_buffer_size = 2;
   test.stream =
       cronet_bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
   cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "POST",
                                     &kTestHeadersArray, false);
   test.BlockForDone();
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_FAILED, test.response_step);
   ASSERT_EQ(net::ERR_QUIC_PROTOCOL_ERROR, test.net_error);
   cronet_bidirectional_stream_destroy(test.stream);
 }
 
-TEST_F(CronetBidirectionalStreamTest, WriteFailsBeforeRequestStarted) {
+TEST_P(CronetBidirectionalStreamTest, WriteFailsBeforeRequestStarted) {
   TestBidirectionalStreamCallback test;
   test.stream =
       cronet_bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
   cronet_bidirectional_stream_write(test.stream, "1", 1, false);
   test.BlockForDone();
   ASSERT_TRUE(test.read_data.empty());
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_FAILED, test.response_step);
   ASSERT_EQ(net::ERR_UNEXPECTED, test.net_error);
   cronet_bidirectional_stream_destroy(test.stream);
 }
 
-TEST_F(CronetBidirectionalStreamTest,
+TEST_P(CronetBidirectionalStreamTest,
        StreamFailBeforeWriteIsExecutedOnNetworkThread) {
   class CustomTestBidirectionalStreamCallback
       : public TestBidirectionalStreamCallback {
     bool MaybeCancel(cronet_bidirectional_stream* stream,
                      ResponseStep step) override {
       if (step == ResponseStep::ON_WRITE_COMPLETED) {
         // Shut down the server, and the stream should error out.
         // The second call to ShutdownQuicTestServer is no-op.
         ShutdownQuicTestServer();
       }
       return TestBidirectionalStreamCallback::MaybeCancel(stream, step);
     }
   };
 
   CustomTestBidirectionalStreamCallback test;
   test.AddWriteData("Test String");
   test.AddWriteData("1234567890");
   test.AddWriteData("woot!");
   test.stream =
       cronet_bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
   cronet_bidirectional_stream_start(test.stream, kTestServerUrl, 0, "POST",
                                     &kTestHeadersArray, false);
   test.BlockForDone();
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_FAILED, test.response_step);
-  ASSERT_EQ(net::ERR_QUIC_PROTOCOL_ERROR, test.net_error);
+  ASSERT_TRUE(test.net_error == net::ERR_QUIC_PROTOCOL_ERROR ||
+              test.net_error == net::ERR_QUIC_HANDSHAKE_FAILED);
   cronet_bidirectional_stream_destroy(test.stream);
 }
 
-TEST_F(CronetBidirectionalStreamTest, FailedResolution) {
+TEST_P(CronetBidirectionalStreamTest, FailedResolution) {
   TestBidirectionalStreamCallback test;
   test.stream =
       cronet_bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
+  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                                GetParam());
   test.cancel_from_step = TestBidirectionalStreamCallback::ON_FAILED;
   cronet_bidirectional_stream_start(test.stream, "https://notfound.example.com",
                                     0, "GET", &kTestHeadersArray, true);
   test.BlockForDone();
   ASSERT_TRUE(test.read_data.empty());
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_FAILED, test.response_step);
   ASSERT_EQ(net::ERR_NAME_NOT_RESOLVED, test.net_error);
   cronet_bidirectional_stream_destroy(test.stream);
 }
 
+INSTANTIATE_TEST_CASE_P(CronetBidirectionalStreamDelayRequestHeadersUntilFlush,
+                        CronetBidirectionalStreamTest,
+                        ::testing::Values(true, false));
+
 }  // namespace cronet