Deleting marionette tcp connector

Author: barancev

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

@@ -34,7 +34,6 @@
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.Proxy;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.firefox.internal.MarionetteConnection;
 import org.openqa.selenium.firefox.internal.NewProfileExtensionConnection;
 import org.openqa.selenium.firefox.internal.ProfilesIni;
 import org.openqa.selenium.internal.Killable;
@@ -107,10 +106,6 @@ public static final class SystemProperty {
   // For now, only enable native events on Windows
   public static final boolean DEFAULT_ENABLE_NATIVE_EVENTS = Platform.getCurrent().is(WINDOWS);
 
-  // For now, only enable native events on Windows
-  public static final boolean USE_MARIONETTE = Boolean.parseBoolean(
-      System.getProperty(SystemProperty.DRIVER_USE_MARIONETTE));
-
   // Accept untrusted SSL certificates.
   @Deprecated
   public static final boolean ACCEPT_UNTRUSTED_CERTIFICATES = true;
@@ -300,15 +295,7 @@ protected ExtensionConnection connectTo(FirefoxBinary binary, FirefoxProfile pro
     Lock lock = obtainLock(profile);
     try {
       FirefoxBinary bin = binary == null ? new FirefoxBinary() : binary;
-
-      if (USE_MARIONETTE) {
-        System.out.println(String.format(
-          "*** Use MarionetteDriver class instead of setting %s property ***",
-          SystemProperty.DRIVER_USE_MARIONETTE));
-        return new MarionetteConnection(lock, bin, profile, host);
-      } else {
-        return new NewProfileExtensionConnection(lock, bin, profile, host);
-      }
+      return new NewProfileExtensionConnection(lock, bin, profile, host);
     } catch (Exception e) {
       throw new WebDriverException(e);
     }