Actually use the new test fixture everywhere

Author: jdcormie

binder/src/test/java/io/grpc/binder/internal/RobolectricBinderTransportTest.java

@@ -175,7 +175,7 @@ BinderClientTransportFactory.Builder newClientTransportFactoryBuilder() {
 
   BinderClientTransportBuilder newClientTransportBuilder() {
     return new BinderClientTransportBuilder()
-        .setClientTransportFactory(newClientTransportFactoryBuilder().buildClientTransportFactory())
+        .setFactory(newClientTransportFactoryBuilder().buildClientTransportFactory())
         .setServerAddress(server.getListenSocketAddress());
   }
 
@@ -187,7 +187,7 @@ protected ManagedClientTransport newClientTransport(InternalServer server) {
 
     return newClientTransportBuilder()
         .setServerAddress(server.getListenSocketAddress())
-        .setClientTransportOptions(options)
+        .setOptions(options)
         .build();
   }
 
@@ -213,7 +213,7 @@ public void clientAuthorizesServerUidsInOrder() throws Exception {
     SettableAsyncSecurityPolicy securityPolicy = new SettableAsyncSecurityPolicy();
     client =
         newClientTransportBuilder()
-            .setClientTransportFactory(
+            .setFactory(
                 newClientTransportFactoryBuilder()
                     .setSecurityPolicy(securityPolicy)
                     .buildClientTransportFactory())
@@ -243,10 +243,15 @@ public void eagAttributeCanOverrideChannelPreAuthServerSetting() throws Exceptio
     options.setEagAttributes(
         Attributes.newBuilder().set(ApiConstants.PRE_AUTH_SERVER_OVERRIDE, true).build());
     client =
-        newClientTransportFactoryBuilder()
-            .setSecurityPolicy(securityPolicy)
-            .buildClientTransportFactory()
-            .newClientTransport(server.getListenSocketAddress(), options, null);
+        newClientTransportBuilder()
+            .setOptions(options)
+            .setFactory(
+                newClientTransportFactoryBuilder()
+                    .setPreAuthorizeServers(preAuthServersParam) // To be overridden.
+                    .setSecurityPolicy(securityPolicy)
+                    .buildClientTransportFactory()
+            )
+            .build();
     runIfNotNull(client.start(mockClientTransportListener));
 
     AuthRequest preAuthRequest = securityPolicy.takeNextAuthRequest(TIMEOUT_MS, MILLISECONDS);

binder/src/testFixtures/java/io/grpc/binder/internal/BinderClientTransportBuilder.java

@@ -44,13 +44,12 @@ public BinderClientTransportBuilder setChannelLogger(ChannelLogger channelLogger
     return this;
   }
 
-  public BinderClientTransportBuilder setClientTransportOptions(ClientTransportOptions options) {
+  public BinderClientTransportBuilder setOptions(ClientTransportOptions options) {
     this.options = checkNotNull(options);
     return this;
   }
 
-  public BinderClientTransportBuilder setClientTransportFactory(
-      BinderClientTransportFactory factory) {
+  public BinderClientTransportBuilder setFactory(BinderClientTransportFactory factory) {
     this.factory = checkNotNull(factory);
     return this;
   }