diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java b/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java index 90893e4286840..e5267c879ca58 100644 --- a/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java +++ b/java/src/org/openqa/selenium/edge/EdgeDriverInfo.java @@ -46,12 +46,9 @@ public Capabilities getCanonicalCapabilities() { @Override public boolean isSupporting(Capabilities capabilities) { - return (EDGE.is(capabilities.getBrowserName()) - || capabilities.getCapability("ms:edgeOptions") != null - || capabilities.getCapability("edgeOptions") != null) - && - (capabilities.getCapability(EdgeOptions.USE_CHROMIUM) == null - || Objects.equals(capabilities.getCapability(EdgeOptions.USE_CHROMIUM), true)); + return EDGE.is(capabilities.getBrowserName()) + || capabilities.getCapability("ms:edgeOptions") != null + || capabilities.getCapability("edgeOptions") != null; } @Override diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverService.java b/java/src/org/openqa/selenium/edge/EdgeDriverService.java index 0d1c6140e3931..2463ecad024ad 100644 --- a/java/src/org/openqa/selenium/edge/EdgeDriverService.java +++ b/java/src/org/openqa/selenium/edge/EdgeDriverService.java @@ -125,11 +125,6 @@ public int score(Capabilities capabilities) { score++; } - Object useChromium = capabilities.getCapability(EdgeOptions.USE_CHROMIUM); - if (Objects.equals(useChromium, false)) { - score--; - } - if (capabilities.getCapability(EdgeOptions.CAPABILITY) != null) { score++; } diff --git a/java/src/org/openqa/selenium/edge/EdgeOptions.java b/java/src/org/openqa/selenium/edge/EdgeOptions.java index 98482aaea3ecf..aa6732ca16e85 100644 --- a/java/src/org/openqa/selenium/edge/EdgeOptions.java +++ b/java/src/org/openqa/selenium/edge/EdgeOptions.java @@ -43,13 +43,6 @@ */ public class EdgeOptions extends ChromiumOptions { - /** - * Key used to indicate whether to use an Edge Chromium or Edge Legacy driver. - * - * @deprecated This will be removed as Chromium based Edge is the only supported one. - */ - public static final String USE_CHROMIUM = "ms:edgeChromium"; - /** * Key used to store a set of ChromeOptions in a {@link Capabilities} * object. diff --git a/java/test/org/openqa/selenium/edge/EdgeDriverInfoTest.java b/java/test/org/openqa/selenium/edge/EdgeDriverInfoTest.java index a7e32e8bd46ac..68b71f2f899b3 100644 --- a/java/test/org/openqa/selenium/edge/EdgeDriverInfoTest.java +++ b/java/test/org/openqa/selenium/edge/EdgeDriverInfoTest.java @@ -46,22 +46,6 @@ public void isSupportingCapabilitiesWithProperBrowserNameOnly() { new ImmutableCapabilities(CapabilityType.BROWSER_NAME, EDGE.browserName()))); } - @Test - public void isNotSupportingEdgeHtml() { - assertThat(new EdgeDriverInfo()).isNot(supporting( - new ImmutableCapabilities( - CapabilityType.BROWSER_NAME, EDGE.browserName(), - EdgeOptions.USE_CHROMIUM, false))); - } - - @Test - public void isSupportingEdgeWithExplicitlySetChromiumFlag() { - assertThat(new EdgeDriverInfo()).is(supporting( - new ImmutableCapabilities( - CapabilityType.BROWSER_NAME, EDGE.browserName(), - EdgeOptions.USE_CHROMIUM, true))); - } - @Test public void isNotSupportingFirefox() { assertThat(new EdgeDriverInfo()).isNot(supporting( @@ -76,16 +60,6 @@ public void canDetectBrowserByVendorSpecificCapability() { new ImmutableCapabilities("edgeOptions", Collections.emptyMap()))); } - @Test - public void canRejectEdgeHtmlByVendorSpecificCapability() { - assertThat(new EdgeDriverInfo()).isNot(supporting( - new ImmutableCapabilities(EdgeOptions.CAPABILITY, Collections.emptyMap(), - EdgeOptions.USE_CHROMIUM, false))); - assertThat(new EdgeDriverInfo()).isNot(supporting( - new ImmutableCapabilities("edgeOptions", Collections.emptyMap(), - EdgeOptions.USE_CHROMIUM, false))); - } - private Condition supporting(Capabilities capabilities) { return new Condition<>(info -> info.isSupporting(capabilities), "supporting " + capabilities); }