From dcc371d5b27cbe6f72bb51ed02f3bbf2fa702bb5 Mon Sep 17 00:00:00 2001
From: Simon Stewart <simon.m.stewart@gmail.com>
Date: Mon, 12 Apr 2021 18:41:56 +0100
Subject: [PATCH] [cdp] Use `se:cdpVersion` if present

---
 .../src/org/openqa/selenium/devtools/DevToolsProvider.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/client/src/org/openqa/selenium/devtools/DevToolsProvider.java b/java/client/src/org/openqa/selenium/devtools/DevToolsProvider.java
index 820b0704fa001..1641b1ca1cd44 100644
--- a/java/client/src/org/openqa/selenium/devtools/DevToolsProvider.java
+++ b/java/client/src/org/openqa/selenium/devtools/DevToolsProvider.java
@@ -41,7 +41,10 @@ public Class<HasDevTools> getDescribedInterface() {
 
   @Override
   public HasDevTools getImplementation(Capabilities caps, ExecuteMethod executeMethod) {
-    CdpInfo info = new CdpVersionFinder().match(caps.getBrowserVersion()).orElseGet(NoOpCdpInfo::new);
+    Object cdpVersion = caps.getCapability("se:cdpVersion");
+    String version = cdpVersion instanceof String ? (String) cdpVersion : caps.getBrowserVersion();
+
+    CdpInfo info = new CdpVersionFinder().match(version).orElseGet(NoOpCdpInfo::new);
     Optional<DevTools> devTools = SeleniumCdpConnection.create(caps).map(conn -> new DevTools(info::getDomains, conn));
 
     return () -> devTools.orElseThrow(() -> new IllegalStateException("Unable to create connection to " + caps));