Remove nsISupports from ChromeUtils.generateQI

This was causing an assert on debug builds of the browser.
acatarineu · Aug 2, 2019 · 45b9907 · 45b9907
1 parent 5b13748
commit 45b9907
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/components/domain-isolator.js b/components/domain-isolator.js
@@ -173,7 +173,7 @@ function DomainIsolator() {
 
 // Firefox component requirements
 DomainIsolator.prototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]),
+  QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
   classDescription: kMODULE_NAME,
   classID: kMODULE_CID,
   contractID: kMODULE_CONTRACTID,

diff --git a/components/dragDropFilter.js b/components/dragDropFilter.js
@@ -32,7 +32,7 @@ function DragDropFilter() {
 
 DragDropFilter.prototype =
 {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]),
+  QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
 
   // make this an nsIClassInfo object
   flags: Ci.nsIClassInfo.DOM_OBJECT,

diff --git a/components/external-app-blocker.js b/components/external-app-blocker.js
@@ -33,7 +33,7 @@ ExternalAppBlocker.prototype =
 {
   _helperAppLauncher: undefined,
 
-  QueryInterface: ChromeUtils.generateQI([Ci.nsISupports, Ci.nsIObserver,
+  QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
                                          Ci.nsIHelperAppWarningDialog]),
 
   // make this an nsIClassInfo object

diff --git a/components/torCheckService.js b/components/torCheckService.js
@@ -25,7 +25,7 @@ function TBTorCheckService() {
 
 TBTorCheckService.prototype =
 {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsISupports, Ci.nsIClassInfo]),
+  QueryInterface: ChromeUtils.generateQI([Ci.nsIClassInfo]),
 
   kCheckNotInitiated: 0, // Possible values for statusOfTorCheck.
   kCheckSuccessful: 1,

diff --git a/components/torbutton-logger.js b/components/torbutton-logger.js
@@ -58,7 +58,7 @@ function padInt(i)
 
 TorbuttonLogger.prototype =
 {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsISupports, Ci.nsIClassInfo]),
+  QueryInterface: ChromeUtils.generateQI([Ci.nsIClassInfo]),
 
   wrappedJSObject: null,  // Initialized by constructor