fix test cases

Author: AgraVator

core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java

@@ -155,7 +155,7 @@ public static ManagedChannelBuilder<?> forTarget(String target) {
 
   private final List<ClientInterceptor> interceptors = new ArrayList<>();
   NameResolverRegistry nameResolverRegistry = NameResolverRegistry.getDefaultRegistry();
-  boolean registryProvided;
+
   @Nullable
   NameResolverProvider nameResolverProvider;
 
@@ -344,7 +344,6 @@ public ManagedChannelImplBuilder(
     }
     if (nameResolverRegistry != null) {
       this.nameResolverRegistry = nameResolverRegistry;
-      this.registryProvided = true;
     }
     if (nameResolverProvider != null) {
       this.nameResolverProvider = nameResolverProvider;
@@ -469,8 +468,7 @@ public ManagedChannelImplBuilder nameResolverFactory(NameResolver.Factory resolv
     Preconditions.checkState(directServerAddress == null,
         "directServerAddress is set (%s), which forbids the use of NameResolverFactory",
         directServerAddress);
-    Preconditions.checkState(!registryProvided,
-        "nameResolverRegistry is already set, which forbids the use of NameResolverFactory");
+
     if (resolverFactory != null) {
       NameResolverRegistry reg = new NameResolverRegistry();
       if (resolverFactory instanceof NameResolverProvider) {
@@ -487,7 +485,6 @@ public ManagedChannelImplBuilder nameResolverFactory(NameResolver.Factory resolv
 
   ManagedChannelImplBuilder nameResolverRegistry(NameResolverRegistry resolverRegistry) {
     this.nameResolverRegistry = resolverRegistry;
-    this.registryProvided = true;
     return this;
   }
 

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

@@ -803,19 +803,6 @@ public void uriPattern() {
 
   private static class CustomSocketAddress extends SocketAddress {}
 
-  @Test
-  @SuppressWarnings("deprecation")
-  public void nameResolverFactory_notAllowedAfterRegistry() {
-    NameResolverRegistry registry = new NameResolverRegistry();
-    builder.nameResolverRegistry(registry);
-    try {
-      builder.nameResolverFactory(mock(NameResolver.Factory.class));
-      fail("Should throw");
-    } catch (IllegalStateException e) {
-      assertThat(e).hasMessageThat().contains("nameResolverRegistry is already set");
-    }
-  }
-
   @Test
   public void getNameResolverProvider_explicitProviderWithIpTarget() {
     String target = "127.0.0.1:8080";