Default to using marionette in all test cases

Author: shs96c

java/client/test/org/openqa/selenium/testing/drivers/ReflectionBackedDriverSupplier.java

@@ -17,23 +17,15 @@
 
 package org.openqa.selenium.testing.drivers;
 
-import static org.openqa.selenium.Platform.WINDOWS;
 import static org.openqa.selenium.testing.DevMode.isInDevMode;
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
-import com.google.common.io.Files;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.firefox.FirefoxProfile;
 import org.openqa.selenium.remote.DesiredCapabilities;
-import org.openqa.selenium.testing.InProject;
 
-import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Logger;
 
@@ -59,30 +51,6 @@ public WebDriver get() {
         return null;
       }
 
-      if (DesiredCapabilities.firefox().getBrowserName().equals(desiredCapsToUse.getBrowserName())) {
-        boolean isMarionette = Boolean.getBoolean(FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE);
-        if (!isMarionette) {
-          desiredCapsToUse.setCapability(FirefoxDriver.MARIONETTE, false);
-          if (isInDevMode()) {
-            copyFirefoxDriverDefaultsToOutputDir();
-          }
-
-          FirefoxProfile profile = new FirefoxProfile();
-          boolean enableNativeEvents = Boolean.getBoolean("selenium.browser.native_events") ||
-                                       Platform.getCurrent().is(WINDOWS);
-          profile.setEnableNativeEvents(enableNativeEvents);
-          desiredCapsToUse.setCapability(FirefoxDriver.PROFILE, profile);
-        }
-
-        try {
-          return driverClass.getConstructor(Capabilities.class,
-                                            Capabilities.class)
-            .newInstance(desiredCapsToUse, requiredCapabilities);
-        } catch (NoSuchMethodException ex) {
-          return driverClass.getConstructor(Capabilities.class).newInstance(desiredCapsToUse);
-        }
-      }
-
       try {
           return driverClass.getConstructor(Capabilities.class,
              Capabilities.class).newInstance(desiredCapsToUse, requiredCapabilities);
@@ -98,25 +66,17 @@ public WebDriver get() {
     }
   }
 
-  private void copyFirefoxDriverDefaultsToOutputDir() throws IOException {
-    File defaults = InProject.locate("javascript/firefox-driver/webdriver.json");
-    File out = InProject.locate("java/client/build/production/org/openqa/selenium/firefox/FirefoxProfile.class").getParentFile();
-    out = new File(out, "webdriver.json");
-    Files.copy(defaults, out);
-  }
-
   // Cover your eyes
   private Class<? extends WebDriver> mapToClass(Capabilities caps) {
     String name = caps == null ? "" : caps.getBrowserName();
-    String className = null;
+    String className;
 
     if (DesiredCapabilities.chrome().getBrowserName().equals(name)) {
       className = "org.openqa.selenium.testing.drivers.TestChromeDriver";
     } else if (DesiredCapabilities.operaBlink().getBrowserName().equals(name)) {
       className = "org.openqa.selenium.testing.drivers.TestOperaBlinkDriver";
     } else if (DesiredCapabilities.firefox().getBrowserName().equals(name)) {
-      Object marionette = caps.getCapability(FirefoxDriver.MARIONETTE);
-      if (isInDevMode() && marionette != null && !(Boolean) marionette) {
+      if (isInDevMode()) {
         className = "org.openqa.selenium.testing.drivers.SynthesizedFirefoxDriver";
       } else {
         className = "org.openqa.selenium.firefox.FirefoxDriver";