Bug 1966575 - [remote] Clean-up QueryInterface and classID usage. r=webdriver-reviewers,jdescottes

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

remote/components/Marionette.sys.mjs

@@ -51,9 +51,6 @@ class MarionetteParentProcess {
     this.server = null;
     this._activePortPath;
 
-    this.classID = Components.ID("{786a1369-dca5-4adc-8486-33d23c88010a}");
-    this.helpInfo = "  --marionette       Enable remote control server.\n";
-
     // Initially set the enabled state based on the environment variable.
     this.enabled = Services.env.exists(ENV_ENABLED);
 
@@ -274,27 +271,25 @@ class MarionetteParentProcess {
     }
   }
 
-  get QueryInterface() {
+  // XPCOM
-    return ChromeUtils.generateQI([
+
-      "nsICommandLineHandler",
+  helpInfo = "  --marionette       Enable remote control server.\n";
-      "nsIMarionette",
+
-      "nsIObserver",
+  QueryInterface = ChromeUtils.generateQI([
-    ]);
+    "nsICommandLineHandler",
-  }
+    "nsIMarionette",
+    "nsIObserver",
+  ]);
 }
 
 class MarionetteContentProcess {
-  constructor() {
-    this.classID = Components.ID("{786a1369-dca5-4adc-8486-33d23c88010a}");
-  }
-
   get running() {
     return Services.cpmm.sharedData.get(SHARED_DATA_ACTIVE_KEY) ?? false;
   }
 
-  get QueryInterface() {
+  // XPCOM
-    return ChromeUtils.generateQI(["nsIMarionette"]);
+
-  }
+  QueryInterface = ChromeUtils.generateQI(["nsIMarionette"]);
 }
 
 export var Marionette;

remote/components/RemoteAgent.sys.mjs

@@ -46,7 +46,6 @@ class RemoteAgentParentProcess {
   #allowOrigins;
   #allowSystemAccess;
   #browserStartupFinished;
-  #classID;
   #enabled;
   #host;
   #port;
@@ -60,7 +59,6 @@ class RemoteAgentParentProcess {
     this.#allowOrigins = null;
     this.#allowSystemAccess = Services.env.exists(ENV_ALLOW_SYSTEM_ACCESS);
     this.#browserStartupFinished = lazy.Deferred();
-    this.#classID = Components.ID("{8f685a9d-8181-46d6-a71d-869289099c6d}");
     this.#enabled = false;
 
     // Configuration for httpd.js
@@ -543,12 +541,7 @@ class RemoteAgentParentProcess {
 
   // XPCOM
 
-  get classID() {
+  helpInfo = `  --remote-debugging-port [<port>] Start the Firefox Remote Agent,
-    return this.#classID;
-  }
-
-  get helpInfo() {
-    return `  --remote-debugging-port [<port>] Start the Firefox Remote Agent,
                      which is a low-level remote debugging interface used for WebDriver
                      BiDi and CDP. Defaults to port 9222.
   --remote-allow-hosts <hosts> Values of the Host header to allow for incoming requests.
@@ -556,15 +549,12 @@ class RemoteAgentParentProcess {
   --remote-allow-origins <origins> Values of the Origin header to allow for incoming requests.
                      Please read security guidelines at https://firefox-source-docs.mozilla.org/remote/Security.html
   --remote-allow-system-access Enable privileged access to the application's parent process\n`;
-  }
 
-  get QueryInterface() {
+  QueryInterface = ChromeUtils.generateQI([
-    return ChromeUtils.generateQI([
+    "nsICommandLineHandler",
-      "nsICommandLineHandler",
+    "nsIObserver",
-      "nsIObserver",
+    "nsIRemoteAgent",
-      "nsIRemoteAgent",
+  ]);
-    ]);
-  }
 }
 
 class RemoteAgentContentProcess {
@@ -572,9 +562,9 @@ class RemoteAgentContentProcess {
     return Services.cpmm.sharedData.get(SHARED_DATA_ACTIVE_KEY) ?? false;
   }
 
-  get QueryInterface() {
+  // XPCOM
-    return ChromeUtils.generateQI(["nsIRemoteAgent"]);
+
-  }
+  QueryInterface = ChromeUtils.generateQI(["nsIRemoteAgent"]);
 }
 
 export var RemoteAgent;

remote/shared/Navigate.sys.mjs

@@ -538,10 +538,10 @@ export class ProgressListener {
     return `[object ${this.constructor.name}]`;
   }
 
-  get QueryInterface() {
+  // XPCOM
-    return ChromeUtils.generateQI([
+
-      "nsIWebProgressListener",
+  QueryInterface = ChromeUtils.generateQI([
-      "nsISupportsWeakReference",
+    "nsIWebProgressListener",
-    ]);
+    "nsISupportsWeakReference",
-  }
+  ]);
 }

remote/shared/listeners/ConsoleListener.sys.mjs

@@ -148,7 +148,7 @@ export class ConsoleListener {
     });
   };
 
-  get QueryInterface() {
+  // XPCOM
-    return ChromeUtils.generateQI(["nsIConsoleListener"]);
+
-  }
+  QueryInterface = ChromeUtils.generateQI(["nsIConsoleListener"]);
 }

remote/shared/test/xpcshell/test_Navigate.js

@@ -33,9 +33,7 @@ class MockRequest {
     this.originalURI = uri;
   }
 
-  get QueryInterface() {
+  QueryInterface = ChromeUtils.generateQI(["nsIRequest", "nsIChannel"]);
-    return ChromeUtils.generateQI(["nsIRequest", "nsIChannel"]);
-  }
 }
 
 class MockWebProgress {

remote/shared/webdriver/Session.sys.mjs

@@ -443,9 +443,7 @@ export class WebDriverSession {
 
   // XPCOM
 
-  get QueryInterface() {
+  QueryInterface = ChromeUtils.generateQI(["nsIHttpRequestHandler"]);
-    return ChromeUtils.generateQI(["nsIHttpRequestHandler"]);
-  }
 }
 
 /**

remote/webdriver-bidi/NewSessionHandler.sys.mjs

@@ -51,7 +51,5 @@ export class WebDriverNewSessionHandler {
 
   // XPCOM
 
-  get QueryInterface() {
+  QueryInterface = ChromeUtils.generateQI(["nsIHttpRequestHandler"]);
-    return ChromeUtils.generateQI(["nsIHttpRequestHandler"]);
-  }
 }