Replace AbstractManagedChannelImplBuilder in ServiceConfigErrorHandlingTest

Author: sergiitk

core/src/test/java/io/grpc/internal/ServiceConfigErrorHandlingTest.java

@@ -46,6 +46,8 @@
 import io.grpc.NameResolver;
 import io.grpc.NameResolver.ConfigOrError;
 import io.grpc.Status;
+import io.grpc.internal.ManagedChannelImplBuilder.ChannelBuilderDefaultPortProvider;
+import io.grpc.internal.ManagedChannelImplBuilder.ClientTransportFactoryBuilder;
 import java.net.SocketAddress;
 import java.net.URI;
 import java.util.ArrayList;
@@ -153,7 +155,18 @@ public ConfigOrError parseLoadBalancingPolicyConfig(
   private ObjectPool<Executor> balancerRpcExecutorPool;
   @Mock
   private Executor blockingExecutor;
-  private ChannelBuilder channelBuilder;
+
+  private ManagedChannelImplBuilder channelBuilder = new ManagedChannelImplBuilder(TARGET,
+      new ClientTransportFactoryBuilder() {
+        @Override public ClientTransportFactory buildClientTransportFactory() {
+          throw new UnsupportedOperationException();
+        }
+      },
+      new ChannelBuilderDefaultPortProvider() {
+        @Override public int getDefaultPort() {
+          return DEFAULT_PORT;
+        }
+      });
 
   private void createChannel(ClientInterceptor... interceptors) {
     checkState(channel == null);
@@ -199,14 +212,12 @@ public void setUp() throws Exception {
         .thenReturn(timer.getScheduledExecutorService());
     when(executorPool.getObject()).thenReturn(executor.getScheduledExecutorService());
 
-    channelBuilder =
-        new ChannelBuilder()
-            .nameResolverFactory(new FakeNameResolverFactory.Builder(expectedUri).build())
-            .defaultLoadBalancingPolicy(MOCK_POLICY_NAME)
-            .userAgent(USER_AGENT)
-            .idleTimeout(
-                AbstractManagedChannelImplBuilder.IDLE_MODE_MAX_TIMEOUT_DAYS, TimeUnit.DAYS)
-            .offloadExecutor(blockingExecutor);
+    channelBuilder
+        .nameResolverFactory(new FakeNameResolverFactory.Builder(expectedUri).build())
+        .defaultLoadBalancingPolicy(MOCK_POLICY_NAME)
+        .userAgent(USER_AGENT)
+        .idleTimeout(ManagedChannelImplBuilder.IDLE_MODE_MAX_TIMEOUT_DAYS, TimeUnit.DAYS)
+        .offloadExecutor(blockingExecutor);
     channelBuilder.executorPool = executorPool;
     channelBuilder.binlog = null;
     channelBuilder.channelz = channelz;
@@ -529,22 +540,6 @@ public void validConfig_thenNoConfig_withDefaultConfig() throws Exception {
     verify(mockLoadBalancer, never()).handleNameResolutionError(any(Status.class));
   }
 
-  private static final class ChannelBuilder
-      extends AbstractManagedChannelImplBuilder<ChannelBuilder> {
-
-    ChannelBuilder() {
-      super(TARGET);
-    }
-
-    @Override protected ClientTransportFactory buildTransportFactory() {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override protected int getDefaultPort() {
-      return DEFAULT_PORT;
-    }
-  }
-
   private static final class FakeBackoffPolicyProvider implements BackoffPolicy.Provider {
     @Override
     public BackoffPolicy get() {