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

components/cronet/ios/BUILD.gn

Index: components/cronet/ios/BUILD.gn
diff --git a/components/cronet/ios/BUILD.gn b/components/cronet/ios/BUILD.gn
index 99ec6520e8a1cab144d97a45f52dff292d4dfcf4..4de541fb921f3e29cc9266346c1493fbbeac42b5 100644
--- a/components/cronet/ios/BUILD.gn
+++ b/components/cronet/ios/BUILD.gn
@@ -8,6 +8,7 @@ import("//build/config/mac/symbols.gni")
 import("//build/mac/tweak_info_plist.gni")
 import("//build/util/process_version.gni")
 import("//build/util/version.gni")
+import("//components/grpc_support/include/headers.gni")
 import("//testing/test.gni")
 import("//url/features.gni")
 
@@ -33,6 +34,7 @@ source_set("cronet_sources") {
   deps = [
     ":cronet_version_header",
     "//base:base",
+    "//components/grpc_support",
     "//components/metrics:metrics",
     "//components/metrics/proto:proto",
     "//components/prefs:prefs",
@@ -51,14 +53,12 @@ source_set("cronet_sources") {
     "../url_request_context_config.h",
     "Cronet.h",
     "Cronet.mm",
-    "cronet_bidirectional_stream.cc",
-    "cronet_bidirectional_stream.h",
-    "cronet_c_for_grpc.cc",
-    "cronet_c_for_grpc.h",
     "cronet_environment.cc",
     "cronet_environment.h",
   ]
 
+  include_dirs = [ "//components/grpc_support/include" ]
+
   if (!use_platform_icu_alternatives) {
     deps += [ "//base:i18n" ]
   }
@@ -147,14 +147,17 @@ ios_framework_bundle("cronet_framework") {
 
   libs = [ "UIKit.Framework" ]
 
-  public_headers = [
-    "Cronet.h",
-    "cronet_c_for_grpc.h",
+  include_dirs = [ "//components/grpc_support/include" ]
+
+  public_deps = [
+    "//components/grpc_support",
   ]
 
+  public_headers = [ "Cronet.h" ]
+  public_headers += grpc_public_headers
+
   sources = [
     "Cronet.h",
-    "cronet_c_for_grpc.h",
   ]
 
   configs -= [ "//build/config/compiler:default_symbols" ]