Geckodriver 0.12 is out

Author: barancev

java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java

@@ -18,7 +18,6 @@
 package org.openqa.selenium.firefox;
 
 import static org.openqa.selenium.firefox.FirefoxOptions.FIREFOX_OPTIONS;
-import static org.openqa.selenium.firefox.FirefoxOptions.OLD_FIREFOX_OPTIONS;
 import static org.openqa.selenium.remote.CapabilityType.ACCEPT_SSL_CERTS;
 import static org.openqa.selenium.remote.CapabilityType.LOGGING_PREFS;
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
@@ -201,9 +200,6 @@ static Capabilities populateProfile(FirefoxProfile profile, Capabilities capabil
         throw new WebDriverException(e);
       }
     }
-    if (rawOptions == null) {
-      rawOptions = capabilities.getCapability(OLD_FIREFOX_OPTIONS);
-    }
     if (rawOptions != null && !(rawOptions instanceof FirefoxOptions)) {
       throw new WebDriverException("Firefox option was set, but is not a FirefoxOption: " + rawOptions);
     }
@@ -216,7 +212,6 @@ static Capabilities populateProfile(FirefoxProfile profile, Capabilities capabil
     DesiredCapabilities toReturn = capabilities instanceof DesiredCapabilities ?
                                    (DesiredCapabilities) capabilities :
                                    new DesiredCapabilities(capabilities);
-    toReturn.setCapability(OLD_FIREFOX_OPTIONS, options);
     toReturn.setCapability(FIREFOX_OPTIONS, options);
     return toReturn;
   }

java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java

@@ -57,8 +57,6 @@
 public class FirefoxOptions {
 
   public final static String FIREFOX_OPTIONS = "moz:firefoxOptions";
-  // TODO(simons): remove once geckodriver 0.12 ships
-  public final static String OLD_FIREFOX_OPTIONS = "firefoxOptions";
 
   private String binary;
   private FirefoxProfile profile;
@@ -202,7 +200,6 @@ public DesiredCapabilities addTo(DesiredCapabilities capabilities) {
     }
 
     capabilities.setCapability(FIREFOX_OPTIONS, this);
-    capabilities.setCapability(OLD_FIREFOX_OPTIONS, this);
 
     if (binary != null) {
       FirefoxBinary actualBinary = new FirefoxBinary(new File(binary));