in-progress changes.

Author: kannanjgithub

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

@@ -34,11 +34,8 @@
 import io.grpc.InsecureChannelCredentials;
 import io.grpc.ManagedChannel;
 import io.grpc.TlsChannelCredentials;
-import io.grpc.internal.ClientTransportFactory;
+import io.grpc.internal.*;
 import io.grpc.internal.ClientTransportFactory.SwapChannelCredentialsResult;
-import io.grpc.internal.FakeClock;
-import io.grpc.internal.GrpcUtil;
-import io.grpc.internal.SharedResourceHolder;
 import io.grpc.testing.GrpcCleanupRule;
 import io.grpc.testing.TlsTesting;
 import java.io.InputStream;
@@ -212,7 +209,7 @@ public void sslSocketFactoryFrom_tls_mtls() throws Exception {
 
     TrustManager[] trustManagers;
     try (InputStream ca = TlsTesting.loadCert("ca.pem")) {
-      trustManagers = OkHttpChannelBuilder.createTrustManager(ca);
+      trustManagers = CertificateUtils.createTrustManager(ca);
     }
 
     SSLContext serverContext = SSLContext.getInstance("TLS");
@@ -257,7 +254,7 @@ public void sslSocketFactoryFrom_tls_mtls_keyFile() throws Exception {
          InputStream ca = TlsTesting.loadCert("ca.pem")) {
       serverContext.init(
           OkHttpChannelBuilder.createKeyManager(server1Chain, server1Key),
-          OkHttpChannelBuilder.createTrustManager(ca),
+          CertificateUtils.createTrustManager(ca),
           null);
     }
     final SSLServerSocket serverListenSocket =