Use the default HttpClient.Factory where possible

Author: shs96c

java/server/src/org/openqa/grid/internal/BaseGridRegistry.java

@@ -19,7 +19,6 @@
 
 import org.openqa.grid.web.Hub;
 import org.openqa.selenium.remote.http.HttpClient;
-import org.openqa.selenium.remote.internal.OkHttpClient;
 
 import java.net.URL;
 
@@ -30,7 +29,7 @@ public abstract class BaseGridRegistry implements GridRegistry {
   protected volatile Hub hub;
 
   public BaseGridRegistry(Hub hub) {
-    this.httpClientFactory = new OkHttpClient.Factory();
+    this.httpClientFactory = HttpClient.Factory.createDefault();
     this.hub = hub;
   }
 

java/server/src/org/openqa/grid/internal/utils/SelfRegisteringRemote.java

@@ -39,7 +39,6 @@
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.remote.internal.OkHttpClient;
 import org.openqa.selenium.remote.server.log.LoggingManager;
 
 import java.net.MalformedURLException;
@@ -65,12 +64,12 @@ public class SelfRegisteringRemote {
   private boolean hasId;
 
   public SelfRegisteringRemote(GridNodeConfiguration configuration) {
-    this(RegistrationRequest.build(configuration));
+    this(RegistrationRequest.build(configuration, null, null));
   }
 
   public SelfRegisteringRemote(RegistrationRequest request) {
     this.registrationRequest = request;
-    this.httpClientFactory = new OkHttpClient.Factory();
+    this.httpClientFactory = HttpClient.Factory.createDefault();
     this.nodeServlets = new HashMap<>();
 
     registrationRequest.validate();