From 295f35f1d519266509fbd3eafb8dcd01a23bd5db Mon Sep 17 00:00:00 2001
From: Eric Gribkoff <ericgribkoff@google.com>
Date: Thu, 15 Mar 2018 18:49:32 -0700
Subject: [PATCH] cronet: delay cast to ExperimentalCronetEngine

---
 .../io/grpc/cronet/CronetChannelBuilder.java  | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java b/cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java
index 005329de226..9cea2f8f7b5 100644
--- a/cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java
+++ b/cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java
@@ -56,7 +56,7 @@ public abstract BidirectionalStream.Builder newBidirectionalStreamBuilder(
   /** Creates a new builder for the given server host, port and CronetEngine. */
   public static CronetChannelBuilder forAddress(String host, int port, CronetEngine cronetEngine) {
     Preconditions.checkNotNull(cronetEngine, "cronetEngine");
-    return new CronetChannelBuilder(host, port, (ExperimentalCronetEngine) cronetEngine);
+    return new CronetChannelBuilder(host, port, cronetEngine);
   }
 
   /**
@@ -73,7 +73,7 @@ public static CronetChannelBuilder forAddress(String name, int port) {
     throw new UnsupportedOperationException("call forAddress(String, int, CronetEngine) instead");
   }
 
-  private final ExperimentalCronetEngine cronetEngine;
+  private final CronetEngine cronetEngine;
 
   private boolean alwaysUsePut = false;
 
@@ -84,7 +84,7 @@ public static CronetChannelBuilder forAddress(String name, int port) {
   private boolean trafficStatsUidSet;
   private int trafficStatsUid;
 
-  private CronetChannelBuilder(String host, int port, ExperimentalCronetEngine cronetEngine) {
+  private CronetChannelBuilder(String host, int port, CronetEngine cronetEngine) {
     super(
         InetSocketAddress.createUnresolved(host, port),
         GrpcUtil.authorityFromHostAndPort(host, port));
@@ -224,14 +224,14 @@ public void close() {
    * StreamBuilderFactory impl that applies TrafficStats tags to stream builders that are produced.
    */
   private static class TaggingStreamFactory extends StreamBuilderFactory {
-    private final ExperimentalCronetEngine cronetEngine;
+    private final CronetEngine cronetEngine;
     private final boolean trafficStatsTagSet;
     private final int trafficStatsTag;
     private final boolean trafficStatsUidSet;
     private final int trafficStatsUid;
 
     TaggingStreamFactory(
-        ExperimentalCronetEngine cronetEngine,
+        CronetEngine cronetEngine,
         boolean trafficStatsTagSet,
         int trafficStatsTag,
         boolean trafficStatsUidSet,
@@ -247,9 +247,14 @@ private static class TaggingStreamFactory extends StreamBuilderFactory {
     public BidirectionalStream.Builder newBidirectionalStreamBuilder(
         String url, BidirectionalStream.Callback callback, Executor executor) {
       ExperimentalBidirectionalStream.Builder builder =
-          cronetEngine.newBidirectionalStreamBuilder(url, callback, executor);
-      if (trafficStatsTagSet) builder.setTrafficStatsTag(trafficStatsTag);
-      if (trafficStatsUidSet) builder.setTrafficStatsUid(trafficStatsUid);
+          ((ExperimentalCronetEngine) cronetEngine)
+              .newBidirectionalStreamBuilder(url, callback, executor);
+      if (trafficStatsTagSet) {
+        builder.setTrafficStatsTag(trafficStatsTag);
+      }
+      if (trafficStatsUidSet) {
+        builder.setTrafficStatsUid(trafficStatsUid);
+      }
       return builder;
     }
   }