[grid] Consolidating getReportedUri logic in CdpEndpointFinder

This is work needed for #9327

Author: diemol

java/client/src/org/openqa/selenium/chromium/ChromiumDevToolsLocator.java

@@ -18,6 +18,7 @@
 package org.openqa.selenium.chromium;
 
 import com.google.common.collect.ImmutableMap;
+
 import org.openqa.selenium.BuildInfo;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Credentials;
@@ -93,7 +94,7 @@ protected ChromiumDriver(CommandExecutor commandExecutor, Capabilities capabilit
 
     HttpClient.Factory factory = HttpClient.Factory.createDefault();
     Capabilities originalCapabilities = super.getCapabilities();
-    Optional<URI> cdpUri = ChromiumDevToolsLocator.getReportedUri(capabilityKey, originalCapabilities)
+    Optional<URI> cdpUri = CdpEndpointFinder.getReportedUri(capabilityKey, originalCapabilities)
       .flatMap(uri -> CdpEndpointFinder.getCdpEndPoint(factory, uri));
 
     connection = cdpUri.map(uri -> new Connection(

java/client/src/org/openqa/selenium/chromium/ChromiumDriver.java

@@ -13,7 +13,7 @@ java_library(
     ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",
-        "//java/client/src/org/openqa/selenium/chromium",
+        "//java/client/src/org/openqa/selenium/devtools",
         "//java/client/src/org/openqa/selenium/json",
         "//java/client/src/org/openqa/selenium/remote",
         "//java/server/src/org/openqa/selenium/grid/component",

java/server/src/org/openqa/selenium/grid/node/BUILD.bazel

@@ -18,7 +18,6 @@
 package org.openqa.selenium.grid.node;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.chromium.ChromiumDevToolsLocator;
 import org.openqa.selenium.devtools.CdpEndpointFinder;
 import org.openqa.selenium.grid.data.Session;
 import org.openqa.selenium.remote.SessionId;
@@ -76,15 +75,22 @@ public Optional<Consumer<Message>> apply(String uri, Consumer<Message> downstrea
     LOG.fine("Scanning for CDP endpoint: " + caps);
 
     // Using strings here to avoid Node depending upon specific drivers.
-    Optional<URI> cdpUri = ChromiumDevToolsLocator.getReportedUri("goog:chromeOptions", caps)
+    Optional<URI> cdpUri = CdpEndpointFinder.getReportedUri("goog:chromeOptions", caps)
       .flatMap(reported -> CdpEndpointFinder.getCdpEndPoint(clientFactory, reported));
     if (cdpUri.isPresent()) {
       LOG.fine("Chrome endpoint found");
       return cdpUri.map(cdp -> createCdpEndPoint(cdp, downstream));
     }
 
+    cdpUri = CdpEndpointFinder.getReportedUri("moz:debuggerAddress", caps)
+      .flatMap(reported -> CdpEndpointFinder.getCdpEndPoint(clientFactory, reported));
+    if (cdpUri.isPresent()) {
+      LOG.fine("Firefox endpoint found");
+      return cdpUri.map(cdp -> createCdpEndPoint(cdp, downstream));
+    }
+
     LOG.fine("Searching for edge options");
-    cdpUri = ChromiumDevToolsLocator.getReportedUri("ms:edgeOptions", caps)
+    cdpUri = CdpEndpointFinder.getReportedUri("ms:edgeOptions", caps)
       .flatMap(reported -> CdpEndpointFinder.getCdpEndPoint(clientFactory, reported));
     return cdpUri.map(cdp -> createCdpEndPoint(cdp, downstream));
   }

java/server/src/org/openqa/selenium/grid/node/ProxyNodeCdp.java

@@ -23,7 +23,7 @@
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.SessionNotCreatedException;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.chromium.ChromiumDevToolsLocator;
+import org.openqa.selenium.devtools.CdpEndpointFinder;
 import org.openqa.selenium.grid.data.CreateSessionRequest;
 import org.openqa.selenium.grid.node.ActiveSession;
 import org.openqa.selenium.grid.node.ProtocolConvertingSession;
@@ -199,10 +199,12 @@ public DevToolsInfo(URI cdpEndpoint, String version) {
     }
 
     Function<Capabilities, Optional<DevToolsInfo>> chrome = c ->
-      ChromiumDevToolsLocator.getReportedUri("goog:chromeOptions", c).map(uri -> new DevToolsInfo(uri, c.getBrowserVersion()));
+      CdpEndpointFinder.getReportedUri("goog:chromeOptions", c)
+        .map(uri -> new DevToolsInfo(uri, c.getBrowserVersion()));
 
     Function<Capabilities, Optional<DevToolsInfo>> edge = c ->
-      ChromiumDevToolsLocator.getReportedUri("ms:edgeOptions", c).map(uri -> new DevToolsInfo(uri, c.getBrowserVersion()));
+      CdpEndpointFinder.getReportedUri("ms:edgeOptions", c)
+        .map(uri -> new DevToolsInfo(uri, c.getBrowserVersion()));
 
     Function<Capabilities, Optional<DevToolsInfo>> firefox = c -> {
       Object address = c.getCapability("moz:debuggerAddress");
@@ -216,7 +218,7 @@ public DevToolsInfo(URI cdpEndpoint, String version) {
       });
     };
 
-    Optional<DevToolsInfo> maybeInfo = Stream.of(chrome, edge)
+    Optional<DevToolsInfo> maybeInfo = Stream.of(chrome, edge, firefox)
       .map(finder -> finder.apply(caps))
       .filter(Optional::isPresent)
       .map(Optional::get)