Bug 1696768 - [marionette] Remove unused "marionette.contentListener" preference. r=marionette-reviewers,jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D107429

modules/libpref/init/all.js

@@ -4551,12 +4551,6 @@ pref("marionette.port", 2828);
 // Sets recommended automation preferences when Marionette is started.
 pref("marionette.prefs.recommended", true);
 
-// Whether content scripts can be safely reused.
-//
-// Deprecated and scheduled for removal with
-// https://bugzil.la/marionette-window-tracking
-pref("marionette.contentListener", false);
-
 #if defined(ENABLE_REMOTE_AGENT)
   // Indicates whether the remote agent is enabled.
   // If it is false, the remote agent will not be loaded.

testing/condprofile/condprof/tests/profile/user.js

@@ -5,6 +5,5 @@ user_pref("marionette.defaultPrefs.port", 2828);
 user_pref("marionette.port", 2828);
 user_pref("marionette.log.level", "Trace");
 user_pref("marionette.log.truncate", false);
-user_pref("marionette.contentListener", false);
 user_pref("extensions.autoDisableScopes", 0);
 user_pref("devtools.debugger.remote-enabled", true);

testing/condprofile/condprof/util.py

@@ -39,7 +39,6 @@ DEFAULT_PREFS = {
     "marionette.port": 2828,
     "marionette.log.level": "Trace",
     "marionette.log.truncate": False,
-    "marionette.contentListener": False,
     "extensions.autoDisableScopes": 10,
     "devtools.debugger.remote-enabled": True,
     "devtools.console.stdout.content": True,

testing/marionette/driver.js

@@ -651,17 +651,7 @@ GeckoDriver.prototype.newSession = async function(cmd) {
   registerCommandsActor();
   registerEventsActor();
 
-  if (!MarionettePrefs.contentListener) {
-    waitForWindow.call(this);
-  } else if (this.appId != APP_ID_FIREFOX && this.curBrowser === null) {
-    // TODO: Still needed?
-    // if there is a content browser, then we just wake it up
-    let win = this.getCurrentWindow();
-    this.addBrowser(win);
-    this.whenBrowserStarted(win, false);
-  } else {
-    throw new error.WebDriverError("Session already running");
-  }
+  waitForWindow.call(this);
 
   for (let win of this.windows) {
     const tabBrowser = browser.getTabBrowser(win);

testing/marionette/prefs.js

@@ -139,20 +139,6 @@ class MarionetteBranch extends Branch {
     return this.get("debugging.clicktostart", false);
   }
 
-  /**
-   * Whether content scripts can be safely reused.
-   *
-   * @deprecated
-   * @return {boolean}
-   */
-  get contentListener() {
-    return this.get("contentListener", false);
-  }
-
-  set contentListener(value) {
-    this.set("contentListener", value);
-  }
-
   /**
    * The `marionette.port` preference, detailing which port
    * the TCP server should listen on.

testing/marionette/server.js

@@ -71,7 +71,6 @@ class TCPListener {
    *     A driver instance.
    */
   driverFactory() {
-    MarionettePrefs.contentListener = false;
     return new GeckoDriver(this);
   }
 

testing/marionette/test/unit/test_prefs.js

@@ -109,7 +109,6 @@ add_test(function test_EnvironmentPrefs_from() {
 
 add_test(function test_MarionettePrefs_getters() {
   equal(false, MarionettePrefs.clickToStart);
-  equal(false, MarionettePrefs.contentListener);
   equal(2828, MarionettePrefs.port);
   equal(Log.Level.Info, MarionettePrefs.logLevel);
   equal(true, MarionettePrefs.recommendedPrefs);
@@ -119,12 +118,9 @@ add_test(function test_MarionettePrefs_getters() {
 
 add_test(function test_MarionettePrefs_setters() {
   try {
-    MarionettePrefs.contentListener = true;
     MarionettePrefs.port = 777;
-    equal(true, MarionettePrefs.contentListener);
     equal(777, MarionettePrefs.port);
   } finally {
-    Services.prefs.clearUserPref("marionette.contentListener");
     Services.prefs.clearUserPref("marionette.port");
   }