java: Implementing MarionetteDriver as a separate class (with @beta annotation)

Author: barancev

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

@@ -301,7 +301,9 @@ protected ExtensionConnection connectTo(FirefoxBinary binary, FirefoxProfile pro
       FirefoxBinary bin = binary == null ? new FirefoxBinary() : binary;
 
       if (USE_MARIONETTE) {
-//        System.out.println("************************** Using 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);

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

@@ -0,0 +1,72 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.firefox;
+
+import org.openqa.selenium.Beta;
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.firefox.internal.MarionetteConnection;
+import org.openqa.selenium.internal.Lock;
+
+/**
+ * An implementation of the {#link WebDriver} interface that drives Firefox using Marionette interface.
+ */
+@Beta
+public class MarionetteDriver extends FirefoxDriver {
+
+  public MarionetteDriver() {
+    this(new FirefoxBinary(), null);
+  }
+
+  public MarionetteDriver(FirefoxProfile profile) {
+    super(profile);
+  }
+
+  public MarionetteDriver(Capabilities desiredCapabilities) {
+    super(desiredCapabilities);
+  }
+
+  public MarionetteDriver(Capabilities desiredCapabilities, Capabilities requiredCapabilities) {
+    super(desiredCapabilities, requiredCapabilities);
+  }
+
+  public MarionetteDriver(FirefoxBinary binary, FirefoxProfile profile) {
+    super(binary, profile);
+  }
+
+  public MarionetteDriver(FirefoxBinary binary, FirefoxProfile profile, Capabilities capabilities) {
+    super(binary, profile, capabilities);
+  }
+
+  public MarionetteDriver(FirefoxBinary binary, FirefoxProfile profile,
+                          Capabilities desiredCapabilities, Capabilities requiredCapabilities) {
+    super(binary, profile, desiredCapabilities, requiredCapabilities);
+  }
+
+  protected ExtensionConnection connectTo(FirefoxBinary binary, FirefoxProfile profile,
+      String host) {
+    Lock lock = obtainLock(profile);
+    try {
+      FirefoxBinary bin = binary == null ? new FirefoxBinary() : binary;
+
+      return new MarionetteConnection(lock, bin, profile, host);
+    } catch (Exception e) {
+      throw new WebDriverException(e);
+    }
+  }
+}

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

@@ -130,7 +130,9 @@ private Class<? extends WebDriver> mapToClass(Capabilities caps) {
   }
 
   private String getFirefoxClassName() {
-    if (isInDevMode()) {
+    if (Boolean.parseBoolean(System.getProperty(FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE))) {
+      return "org.openqa.selenium.firefox.MarionetteDriver";
+    } else if (isInDevMode()) {
       return "org.openqa.selenium.testing.drivers.SynthesizedFirefoxDriver";
     } else {
       return "org.openqa.selenium.firefox.FirefoxDriver";