Remove unnecessary uses of FakeX509ExtendedTrustManager

Author: ejona86

okhttp/src/test/java/io/grpc/okhttp/TlsTest.java

@@ -123,10 +123,13 @@ public void perRpcAuthorityOverride_hostnameVerification_success()
                 .keyManager(serverCert, serverPrivateKey)
                 .build();
       }
+      ChannelCredentials channelCreds;
+      try (InputStream caCert = TlsTesting.loadCert("ca.pem")) {
+        channelCreds = TlsChannelCredentials.newBuilder()
+            .trustManager(caCert)
+            .build();
+      }
       Server server = grpcCleanupRule.register(server(serverCreds));
-      ChannelCredentials channelCreds = TlsChannelCredentials.newBuilder()
-              .trustManager(getFakeX509ExtendedTrustManager())
-              .build();
       ManagedChannel channel = grpcCleanupRule.register(clientChannel(server, channelCreds));
 
       ClientCalls.blockingUnaryCall(channel, SimpleServiceGrpc.getUnaryRpcMethod(),
@@ -149,10 +152,13 @@ public void perRpcAuthorityOverride_hostnameVerification_failure_rpcFails()
                 .keyManager(serverCert, serverPrivateKey)
                 .build();
       }
+      ChannelCredentials channelCreds;
+      try (InputStream caCert = TlsTesting.loadCert("ca.pem")) {
+        channelCreds = TlsChannelCredentials.newBuilder()
+            .trustManager(caCert)
+            .build();
+      }
       Server server = grpcCleanupRule.register(server(serverCreds));
-      ChannelCredentials channelCreds = TlsChannelCredentials.newBuilder()
-              .trustManager(getFakeX509ExtendedTrustManager())
-              .build();
       ManagedChannel channel = grpcCleanupRule.register(clientChannel(server, channelCreds));
 
       try {
@@ -180,10 +186,13 @@ public void perRpcAuthorityOverride_hostnameVerification_failure_flagDisabled_rp
               .keyManager(serverCert, serverPrivateKey)
               .build();
     }
+    ChannelCredentials channelCreds;
+    try (InputStream caCert = TlsTesting.loadCert("ca.pem")) {
+      channelCreds = TlsChannelCredentials.newBuilder()
+          .trustManager(caCert)
+          .build();
+    }
     Server server = grpcCleanupRule.register(server(serverCreds));
-    ChannelCredentials channelCreds = TlsChannelCredentials.newBuilder()
-            .trustManager(getFakeX509ExtendedTrustManager())
-            .build();
     ManagedChannel channel = grpcCleanupRule.register(clientChannel(server, channelCreds));
 
     ClientCalls.blockingUnaryCall(channel, SimpleServiceGrpc.getUnaryRpcMethod(),