[Cronet] Don't send endOfStream if there is pending data to flush 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>
 
@@ skipping 420 matching lines @@
             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, TestDelayedFlush) {
+  class CustomTestBidirectionalStreamCallback
+      : public TestBidirectionalStreamCallback {
+    void MaybeWriteNextData(cronet_bidirectional_stream* stream) override {
+      DCHECK_EQ(stream, this->stream);
+      if (write_data.empty())
+        return;
+      // Write all buffers when stream is ready.
+      // Flush after "3" and "5".
+      // EndOfStream is set with "6" but not flushed, so it is not sent.
+      if (write_data.front()->buffer == "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);
+          }
+        }
+      }
+      // Flush the final buffer with endOfStream flag.
+      if (write_data.front()->buffer == "6")
+        cronet_bidirectional_stream_flush(stream);
+    }
+  };
+
+  CustomTestBidirectionalStreamCallback test;
+  test.AddWriteData("1", false);
+  test.AddWriteData("2", false);
+  test.AddWriteData("3", true);
+  test.AddWriteData("4", false);
+  test.AddWriteData("5", true);
+  test.AddWriteData("6", false);
+  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();
+  // 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);
@@ skipping 150 matching lines @@
   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