[java] Remove Edge USE_CHROMIUM flag. (SeleniumHQ#9921)

elgatov · Jun 27, 2022 · 34ff5c1 · 34ff5c1
1 parent 251996a
commit 34ff5c1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 44 deletions.
diff --git 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
@@ -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
@@ -43,13 +43,6 @@
  */
 public class EdgeOptions extends ChromiumOptions<EdgeOptions> {
 
-  /**
-   * 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
@@ -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<EdgeDriverInfo> supporting(Capabilities capabilities) {
     return new Condition<>(info -> info.isSupporting(capabilities), "supporting " + capabilities);
   }