Third try at landing gRPC refactoring. Previous issue failed on the waterfall

components/grpc_support/bidirectional_stream_unittest.cc

Index: components/grpc_support/bidirectional_stream_unittest.cc
diff --git a/components/cronet/ios/test/cronet_bidirectional_stream_test.mm b/components/grpc_support/bidirectional_stream_unittest.cc
similarity index 52%
rename from components/cronet/ios/test/cronet_bidirectional_stream_test.mm
rename to components/grpc_support/bidirectional_stream_unittest.cc
index f6421d7a80a0cd0a1e517328ea79516eb3f06e70..3ef83ffe9c1cf2fc7e768ebc82efc25078a10cdb 100644
--- a/components/cronet/ios/test/cronet_bidirectional_stream_test.mm
+++ b/components/grpc_support/bidirectional_stream_unittest.cc
@@ -2,85 +2,55 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import <Cronet/Cronet.h>
-
 #include <stdint.h>
 #include <list>
 #include <map>
 #include <string>
-#include <Cronet/cronet_c_for_grpc.h>
 
-#include "base/at_exit.h"
 #include "base/logging.h"
-#include "base/mac/scoped_nsobject.h"
 #include "base/macros.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/test/quic_test_server.h"
-#include "net/base/mac/url_conversions.h"
+#include "components/grpc_support/include/bidirectional_stream_c.h"
+#include "components/grpc_support/test/get_stream_engine.h"
+#include "components/grpc_support/test/quic_test_server.h"
 #include "net/base/net_errors.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "testing/gtest_mac.h"
 #include "url/gurl.h"
 
 namespace {
 
-cronet_bidirectional_stream_header kTestHeaders[] = {
+bidirectional_stream_header kTestHeaders[] = {
     {"header1", "foo"},
     {"header2", "bar"},
 };
-const cronet_bidirectional_stream_header_array kTestHeadersArray = {
-    2, 2, kTestHeaders};
+const bidirectional_stream_header_array kTestHeadersArray = {2, 2,
+                                                             kTestHeaders};
 }  // namespace
 
-namespace cronet {
-
-base::AtExitManager* g_at_exit_ = nullptr;
-
-void StartCronetIfNecessary() {
-  static bool initialized = false;
-  if (!initialized) {
-    initialized = true;
-    [Cronet setUserAgent:@"CronetTest/1.0.0.0" partial:NO];
-    [Cronet setHttp2Enabled:true];
-    [Cronet setQuicEnabled:true];
-    [Cronet setSslKeyLogFileName:@"SSLKEYLOGFILE"];
-
-    [Cronet addQuicHint:@"test.example.com"
-                   port:cronet::kTestServerPort
-                altPort:cronet::kTestServerPort];
-    [Cronet enableTestCertVerifierForTesting];
-    [Cronet
-        setHostResolverRulesForTesting:@"MAP test.example.com 127.0.0.1,"
-                                        "MAP notfound.example.com ~NOTFOUND"];
-    [Cronet start];
-
-    // This method must be called once from the main thread.
-    if (!g_at_exit_)
-      g_at_exit_ = new base::AtExitManager;
-  }
-}
+namespace grpc_support {
 
-class CronetBidirectionalStreamTest : public ::testing::TestWithParam<bool> {
+class BidirectionalStreamTest : public ::testing::TestWithParam<bool> {
  protected:
-  CronetBidirectionalStreamTest() {}
-  ~CronetBidirectionalStreamTest() override {}
-
   void SetUp() override {
-    StartCronetIfNecessary();
     StartQuicTestServer();
-    [Cronet startNetLogToFile:@"cronet_netlog.json" logBytes:YES];
   }
 
   void TearDown() override {
     ShutdownQuicTestServer();
-    [Cronet stopNetLog];
   }
 
-  cronet_engine* engine() { return [Cronet getGlobalEngine]; }
+  BidirectionalStreamTest() {}
+  ~BidirectionalStreamTest() override {}
+
+  stream_engine* engine() {
+    return GetTestStreamEngine(GetQuicTestServerPort());
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BidirectionalStreamTest);
 };
 
 class TestBidirectionalStreamCallback {
@@ -99,7 +69,7 @@ class TestBidirectionalStreamCallback {
 
   struct WriteData {
     std::string buffer;
-    // If |flush| is true, then cronet_bidirectional_stream_flush() will be
+    // If |flush| is true, then bidirectional_stream_flush() will be
     // called after writing of the |buffer|.
     bool flush;
 
@@ -109,7 +79,7 @@ class TestBidirectionalStreamCallback {
     DISALLOW_COPY_AND_ASSIGN(WriteData);
   };
 
-  cronet_bidirectional_stream* stream;
+  bidirectional_stream* stream;
   base::WaitableEvent stream_done_event;
 
   // Test parameters.
@@ -140,17 +110,16 @@ class TestBidirectionalStreamCallback {
 
   ~TestBidirectionalStreamCallback() {
     if (read_buffer)
-      delete read_buffer;
+      delete[] read_buffer;
   }
 
   static TestBidirectionalStreamCallback* FromStream(
-      cronet_bidirectional_stream* stream) {
+      bidirectional_stream* stream) {
     DCHECK(stream);
     return (TestBidirectionalStreamCallback*)stream->annotation;
   }
 
-  virtual bool MaybeCancel(cronet_bidirectional_stream* stream,
-                           ResponseStep step) {
+  virtual bool MaybeCancel(bidirectional_stream* stream, ResponseStep step) {
     DCHECK_EQ(stream, this->stream);
     response_step = step;
     DLOG(WARNING) << "Step: " << step;
@@ -158,8 +127,8 @@ class TestBidirectionalStreamCallback {
     if (step != cancel_from_step)
       return false;
 
-    cronet_bidirectional_stream_cancel(stream);
-    cronet_bidirectional_stream_write(stream, "abc", 3, false);
+    bidirectional_stream_cancel(stream);
+    bidirectional_stream_write(stream, "abc", 3, false);
 
     return true;
   }
@@ -173,26 +142,26 @@ class TestBidirectionalStreamCallback {
     write_data.push_back(base::MakeUnique<WriteData>(data, flush));
   }
 
-  virtual void MaybeWriteNextData(cronet_bidirectional_stream* stream) {
+  virtual void MaybeWriteNextData(bidirectional_stream* stream) {
     DCHECK_EQ(stream, this->stream);
     if (write_data.empty())
       return;
     for (const auto& data : write_data) {
-      cronet_bidirectional_stream_write(stream, data->buffer.c_str(),
-                                        data->buffer.size(),
-                                        data == write_data.back());
+      bidirectional_stream_write(stream, data->buffer.c_str(),
+                                 data->buffer.size(),
+                                 data == write_data.back());
       if (data->flush) {
-        cronet_bidirectional_stream_flush(stream);
+        bidirectional_stream_flush(stream);
         break;
       }
     }
   }
 
-  cronet_bidirectional_stream_callback* callback() const { return &s_callback; }
+  bidirectional_stream_callback* callback() const { return &s_callback; }
 
  private:
   // C callbacks.
-  static void on_stream_ready_callback(cronet_bidirectional_stream* stream) {
+  static void on_stream_ready_callback(bidirectional_stream* stream) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
     if (test->MaybeCancel(stream, ON_STREAM_READY))
       return;
@@ -200,8 +169,8 @@ class TestBidirectionalStreamCallback {
   }
 
   static void on_response_headers_received_callback(
-      cronet_bidirectional_stream* stream,
-      const cronet_bidirectional_stream_header_array* headers,
+      bidirectional_stream* stream,
+      const bidirectional_stream_header_array* headers,
       const char* negotiated_protocol) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
     ASSERT_EQ(test->expected_negotiated_protocol,
@@ -213,11 +182,11 @@ class TestBidirectionalStreamCallback {
     if (test->MaybeCancel(stream, ON_RESPONSE_STARTED))
       return;
     test->read_buffer = new char[test->read_buffer_size];
-    cronet_bidirectional_stream_read(stream, test->read_buffer,
-                                     test->read_buffer_size);
+    bidirectional_stream_read(stream, test->read_buffer,
+                              test->read_buffer_size);
   }
 
-  static void on_read_completed_callback(cronet_bidirectional_stream* stream,
+  static void on_read_completed_callback(bidirectional_stream* stream,
                                          char* data,
                                          int count) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
@@ -226,11 +195,11 @@ class TestBidirectionalStreamCallback {
       return;
     if (count == 0)
       return;
-    cronet_bidirectional_stream_read(stream, test->read_buffer,
-                                     test->read_buffer_size);
+    bidirectional_stream_read(stream, test->read_buffer,
+                              test->read_buffer_size);
   }
 
-  static void on_write_completed_callback(cronet_bidirectional_stream* stream,
+  static void on_write_completed_callback(bidirectional_stream* stream,
                                           const char* data) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
     ASSERT_EQ(test->write_data.front()->buffer.c_str(), data);
@@ -243,8 +212,8 @@ class TestBidirectionalStreamCallback {
   }
 
   static void on_response_trailers_received_callback(
-      cronet_bidirectional_stream* stream,
-      const cronet_bidirectional_stream_header_array* trailers) {
+      bidirectional_stream* stream,
+      const 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] =
@@ -255,40 +224,38 @@ class TestBidirectionalStreamCallback {
       return;
   }
 
-  static void on_succeded_callback(cronet_bidirectional_stream* stream) {
+  static void on_succeded_callback(bidirectional_stream* stream) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
     ASSERT_TRUE(test->write_data.empty());
     test->MaybeCancel(stream, ON_SUCCEEDED);
     test->SignalDone();
   }
 
-  static void on_failed_callback(cronet_bidirectional_stream* stream,
-                                 int net_error) {
+  static void on_failed_callback(bidirectional_stream* stream, int net_error) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
     test->net_error = net_error;
     test->MaybeCancel(stream, ON_FAILED);
     test->SignalDone();
   }
 
-  static void on_canceled_callback(cronet_bidirectional_stream* stream) {
+  static void on_canceled_callback(bidirectional_stream* stream) {
     TestBidirectionalStreamCallback* test = FromStream(stream);
     test->MaybeCancel(stream, ON_CANCELED);
     test->SignalDone();
   }
 
-  static cronet_bidirectional_stream_callback s_callback;
+  static bidirectional_stream_callback s_callback;
 };
 
-cronet_bidirectional_stream_callback
-    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};
+bidirectional_stream_callback 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};
 
 TestBidirectionalStreamCallback::WriteData::WriteData(const std::string& data,
                                                       bool flush_after)
@@ -296,19 +263,18 @@ TestBidirectionalStreamCallback::WriteData::WriteData(const std::string& data,
 
 TestBidirectionalStreamCallback::WriteData::~WriteData() {}
 
-TEST_P(CronetBidirectionalStreamTest, StartExampleBidiStream) {
+TEST_P(BidirectionalStreamTest, StartExampleBidiStream) {
   TestBidirectionalStreamCallback test;
   test.AddWriteData("Hello, ");
   test.AddWriteData("world!");
   // Use small read buffer size to test that response is split properly.
   test.read_buffer_size = 2;
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = 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);
+  bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                         GetParam());
+  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),
@@ -320,21 +286,20 @@ TEST_P(CronetBidirectionalStreamTest, StartExampleBidiStream) {
   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);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, SimplePutWithEmptyWriteDataAtTheEnd) {
+TEST_P(BidirectionalStreamTest, SimplePutWithEmptyWriteDataAtTheEnd) {
   TestBidirectionalStreamCallback test;
   test.AddWriteData("Hello, ");
   test.AddWriteData("world!");
   test.AddWriteData("");
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = 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, "PUT",
-                                    &kTestHeadersArray, false);
+  bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                         GetParam());
+  bidirectional_stream_start(test.stream, kTestServerUrl, 0,
+                             "PUT", &kTestHeadersArray, false);
   test.BlockForDone();
   ASSERT_EQ(std::string(kHelloStatus), test.response_headers[kStatusHeader]);
   ASSERT_EQ(std::string(kHelloHeaderValue),
@@ -343,21 +308,20 @@ TEST_P(CronetBidirectionalStreamTest, SimplePutWithEmptyWriteDataAtTheEnd) {
   ASSERT_EQ(std::string(kHelloBodyValue), test.read_data.front());
   ASSERT_EQ(std::string(kHelloTrailerValue),
             test.response_trailers[kHelloTrailerName]);
-  cronet_bidirectional_stream_destroy(test.stream);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, SimpleGetWithFlush) {
+TEST_P(BidirectionalStreamTest, SimpleGetWithFlush) {
   TestBidirectionalStreamCallback test;
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = 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());
+  bidirectional_stream_disable_auto_flush(test.stream, true);
+  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);
+  bidirectional_stream_flush(test.stream);
+  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),
@@ -367,25 +331,24 @@ TEST_P(CronetBidirectionalStreamTest, SimpleGetWithFlush) {
   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);
+  bidirectional_stream_flush(test.stream);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlush) {
+TEST_P(BidirectionalStreamTest, 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());
+  test.stream = 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());
+  bidirectional_stream_disable_auto_flush(test.stream, true);
+  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);
+  bidirectional_stream_flush(test.stream);
+  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),
@@ -395,11 +358,11 @@ TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlush) {
   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);
+  bidirectional_stream_flush(test.stream);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlushTwice) {
+TEST_P(BidirectionalStreamTest, SimplePostWithFlushTwice) {
   TestBidirectionalStreamCallback test;
   test.AddWriteData("Test String", false);
   test.AddWriteData("1234567890", false);
@@ -407,16 +370,15 @@ TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlushTwice) {
   test.AddWriteData("Test String", false);
   test.AddWriteData("1234567890", false);
   test.AddWriteData("woot!", true);
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = 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());
+  bidirectional_stream_disable_auto_flush(test.stream, true);
+  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);
+  bidirectional_stream_flush(test.stream);
+  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),
@@ -426,25 +388,24 @@ TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlushTwice) {
   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);
+  bidirectional_stream_flush(test.stream);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlushAfterOneWrite) {
+TEST_P(BidirectionalStreamTest, 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());
+  test.stream = 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());
+  bidirectional_stream_disable_auto_flush(test.stream, true);
+  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);
+  bidirectional_stream_flush(test.stream);
+  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),
@@ -454,14 +415,14 @@ TEST_P(CronetBidirectionalStreamTest, SimplePostWithFlushAfterOneWrite) {
   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);
+  bidirectional_stream_flush(test.stream);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, TestDelayedFlush) {
+TEST_P(BidirectionalStreamTest, TestDelayedFlush) {
   class CustomTestBidirectionalStreamCallback
       : public TestBidirectionalStreamCallback {
-    void MaybeWriteNextData(cronet_bidirectional_stream* stream) override {
+    void MaybeWriteNextData(bidirectional_stream* stream) override {
       DCHECK_EQ(stream, this->stream);
       if (write_data.empty())
         return;
@@ -470,17 +431,17 @@ TEST_P(CronetBidirectionalStreamTest, TestDelayedFlush) {
       // 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());
+          bidirectional_stream_write(stream, data->buffer.c_str(),
+                                     data->buffer.size(),
+                                     data == write_data.back());
           if (data->flush) {
-            cronet_bidirectional_stream_flush(stream);
+            bidirectional_stream_flush(stream);
           }
         }
       }
       // Flush the final buffer with endOfStream flag.
       if (write_data.front()->buffer == "6")
-        cronet_bidirectional_stream_flush(stream);
+        bidirectional_stream_flush(stream);
     }
   };
 
@@ -491,96 +452,88 @@ TEST_P(CronetBidirectionalStreamTest, TestDelayedFlush) {
   test.AddWriteData("4", false);
   test.AddWriteData("5", true);
   test.AddWriteData("6", false);
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = 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());
+  bidirectional_stream_disable_auto_flush(test.stream, true);
+  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);
+  bidirectional_stream_flush(test.stream);
+  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);
+  bidirectional_stream_flush(test.stream);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, CancelOnRead) {
+TEST_P(BidirectionalStreamTest, CancelOnRead) {
   TestBidirectionalStreamCallback test;
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
-  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
-                                                                GetParam());
+  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);
+  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);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, CancelOnResponse) {
+TEST_P(BidirectionalStreamTest, CancelOnResponse) {
   TestBidirectionalStreamCallback test;
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
-  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
-                                                                GetParam());
+  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);
+  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);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, CancelOnSucceeded) {
+TEST_P(BidirectionalStreamTest, CancelOnSucceeded) {
   TestBidirectionalStreamCallback test;
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
-  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
-                                                                GetParam());
+  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);
+  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);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, ReadFailsBeforeRequestStarted) {
+TEST_P(BidirectionalStreamTest, ReadFailsBeforeRequestStarted) {
   TestBidirectionalStreamCallback test;
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
-  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
-                                                                GetParam());
+  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));
+  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);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest,
-       StreamFailBeforeReadIsExecutedOnNetworkThread) {
+TEST_P(BidirectionalStreamTest, StreamFailBeforeReadIsExecutedOnNetworkThread) {
   class CustomTestBidirectionalStreamCallback
       : public TestBidirectionalStreamCallback {
-    bool MaybeCancel(cronet_bidirectional_stream* stream,
-                     ResponseStep step) override {
+    bool MaybeCancel(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.
@@ -594,39 +547,36 @@ TEST_P(CronetBidirectionalStreamTest,
   test.AddWriteData("Hello, ");
   test.AddWriteData("world!");
   test.read_buffer_size = 2;
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = 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);
+  bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                         GetParam());
+  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);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, WriteFailsBeforeRequestStarted) {
+TEST_P(BidirectionalStreamTest, WriteFailsBeforeRequestStarted) {
   TestBidirectionalStreamCallback test;
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = 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);
+  bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                         GetParam());
+  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);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, StreamFailAfterStreamReadyCallback) {
+TEST_P(BidirectionalStreamTest, StreamFailAfterStreamReadyCallback) {
   class CustomTestBidirectionalStreamCallback
       : public TestBidirectionalStreamCallback {
-    bool MaybeCancel(cronet_bidirectional_stream* stream,
-                     ResponseStep step) override {
+    bool MaybeCancel(bidirectional_stream* stream, ResponseStep step) override {
       if (step == ResponseStep::ON_STREAM_READY) {
         // Shut down the server, and the stream should error out.
         // The second call to ShutdownQuicTestServer is no-op.
@@ -638,26 +588,25 @@ TEST_P(CronetBidirectionalStreamTest, StreamFailAfterStreamReadyCallback) {
 
   CustomTestBidirectionalStreamCallback test;
   test.AddWriteData("Test String");
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = 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);
+  bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                         GetParam());
+  bidirectional_stream_start(test.stream, kTestServerUrl, 0,
+                             "POST", &kTestHeadersArray, false);
   test.BlockForDone();
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_FAILED, test.response_step);
   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.net_error == net::ERR_QUIC_HANDSHAKE_FAILED ||
+              test.net_error == net::ERR_CONNECTION_REFUSED);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest,
+TEST_P(BidirectionalStreamTest,
        StreamFailBeforeWriteIsExecutedOnNetworkThread) {
   class CustomTestBidirectionalStreamCallback
       : public TestBidirectionalStreamCallback {
-    bool MaybeCancel(cronet_bidirectional_stream* stream,
-                     ResponseStep step) override {
+    bool MaybeCancel(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.
@@ -671,39 +620,37 @@ TEST_P(CronetBidirectionalStreamTest,
   test.AddWriteData("Test String");
   test.AddWriteData("1234567890");
   test.AddWriteData("woot!");
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = 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);
+  bidirectional_stream_delay_request_headers_until_flush(test.stream,
+                                                         GetParam());
+  bidirectional_stream_start(test.stream, kTestServerUrl, 0,
+                             "POST", &kTestHeadersArray, false);
   test.BlockForDone();
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_FAILED, test.response_step);
   ASSERT_TRUE(test.net_error == net::ERR_QUIC_PROTOCOL_ERROR ||
               test.net_error == net::ERR_QUIC_HANDSHAKE_FAILED);
-  cronet_bidirectional_stream_destroy(test.stream);
+  bidirectional_stream_destroy(test.stream);
 }
 
-TEST_P(CronetBidirectionalStreamTest, FailedResolution) {
+TEST_P(BidirectionalStreamTest, FailedResolution) {
   TestBidirectionalStreamCallback test;
-  test.stream =
-      cronet_bidirectional_stream_create(engine(), &test, test.callback());
+  test.stream = bidirectional_stream_create(engine(), &test, test.callback());
   DCHECK(test.stream);
-  cronet_bidirectional_stream_delay_request_headers_until_flush(test.stream,
-                                                                GetParam());
+  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);
+  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);
+  bidirectional_stream_destroy(test.stream);
 }
 
-INSTANTIATE_TEST_CASE_P(CronetBidirectionalStreamDelayRequestHeadersUntilFlush,
-                        CronetBidirectionalStreamTest,
+INSTANTIATE_TEST_CASE_P(BidirectionalStreamDelayRequestHeadersUntilFlush,
+                        BidirectionalStreamTest,
                         ::testing::Values(true, false));
 
-}  // namespace cronet
+}  // namespace grpc_support