Make sure Options do not require DesiredCapabilities

Author: shs96c

java/client/src/org/openqa/selenium/chrome/ChromeOptions.java

@@ -32,6 +32,8 @@
 import org.openqa.selenium.PageLoadStrategy;
 import org.openqa.selenium.SessionNotCreatedException;
 import org.openqa.selenium.UnexpectedAlertBehaviour;
+import org.openqa.selenium.remote.BrowserType;
+import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.io.File;
@@ -77,6 +79,10 @@ public class ChromeOptions extends MutableCapabilities {
   private List<String> extensions = Lists.newArrayList();
   private Map<String, Object> experimentalOptions = Maps.newHashMap();
 
+  public ChromeOptions() {
+    setCapability(CapabilityType.BROWSER_NAME, BrowserType.CHROME);
+  }
+
   /**
    * Sets the path to the Chrome executable. This path should exist on the
    * machine which will launch Chrome. The path should either be absolute or

java/client/src/org/openqa/selenium/ie/InternetExplorerOptions.java

@@ -29,7 +29,9 @@
 import static org.openqa.selenium.ie.InternetExplorerDriver.INTRODUCE_FLAKINESS_BY_IGNORING_SECURITY_DOMAINS;
 import static org.openqa.selenium.ie.InternetExplorerDriver.NATIVE_EVENTS;
 import static org.openqa.selenium.ie.InternetExplorerDriver.REQUIRE_WINDOW_FOCUS;
+import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
 import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
+import static org.openqa.selenium.remote.CapabilityType.PLATFORM;
 import static org.openqa.selenium.remote.CapabilityType.UNHANDLED_PROMPT_BEHAVIOUR;
 
 import com.google.common.base.Preconditions;
@@ -41,8 +43,11 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.PageLoadStrategy;
+import org.openqa.selenium.Platform;
 import org.openqa.selenium.UnexpectedAlertBehaviour;
 import org.openqa.selenium.internal.ElementScrollBehavior;
+import org.openqa.selenium.remote.BrowserType;
+import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.time.Duration;
@@ -99,6 +104,9 @@ public InternetExplorerOptions(Capabilities source) {
     super();
 
     setCapability(IE_OPTIONS, ieOptions);
+    setCapability(BROWSER_NAME, BrowserType.IE);
+    setCapability(PLATFORM, Platform.WINDOWS);
+    setCapability(CapabilityType.ForSeleniumServer.ENSURING_CLEAN_SESSION, true);
 
     merge(source);
   }