Bug 1457713 - Port bug 1456035 [Remove nsISupports from calls to XPCOMUtils.generateQI()] suite/ part. r=frg DONTBUILD CLOSED TREE

suite/browser/test/browser/browser_pluginplaypreview.js

@@ -52,7 +52,6 @@ function registerPlayPreview(mimeType, targetUrl) {
   function OverlayStreamConverter() {}
   OverlayStreamConverter.prototype = {
     QueryInterface: XPCOMUtils.generateQI([
-        Ci.nsISupports,
         Ci.nsIStreamConverter,
         Ci.nsIStreamListener,
         Ci.nsIRequestObserver

suite/common/sync/syncSetup.js

@@ -26,8 +26,7 @@ ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 
 var gSyncSetup = {
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
-                                         Ci.nsIWebProgressListener,
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
                                          Ci.nsISupportsWeakReference]),
 
   captchaBrowser: null,

suite/common/viewZoomOverlay.js

@@ -41,8 +41,7 @@ var FullZoom = FullZoom || {
                          Ci.nsIObserver,
                          Ci.nsIContentPrefObserver,
                          Ci.nsIContentPrefCallback2,
-                         Ci.nsISupportsWeakReference,
-                         Ci.nsISupports]),
+                         Ci.nsISupportsWeakReference]),
 
   //**************************************************************************//
   // Initialization & Destruction

suite/components/feeds/FeedConverter.js

@@ -126,8 +126,7 @@ FeedConverter.prototype = {
     [Ci.nsIFeedResultListener,
      Ci.nsIStreamConverter,
      Ci.nsIStreamListener,
-     Ci.nsIRequestObserver,
-     Ci.nsISupports]),
+     Ci.nsIRequestObserver]),
   classID: Components.ID("{88592f45-3866-4c8e-9d8a-ab58b290fcf7}"),
 
   /**
@@ -462,8 +461,7 @@ FeedResultService.prototype = {
       delete this._results[uri.spec];
   },
 
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIFeedResultService,
-                                         Ci.nsISupports]),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIFeedResultService]),
   classID: Components.ID("{e5b05e9d-f037-48e4-b9a4-b99476582927}")
 };
 
@@ -541,8 +539,7 @@ GenericProtocolHandler.prototype = {
     return channel;
   },
 
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler,
-                                         Ci.nsISupports])
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler])
 };
 
 function FeedProtocolHandler() {

suite/components/feeds/WebContentConverter.js

@@ -62,8 +62,7 @@ WebContentConverter.prototype = {
 
   QueryInterface: XPCOMUtils.generateQI(
     [Ci.nsIStreamConverter,
-     Ci.nsIStreamListener,
-     Ci.nsISupports])
+     Ci.nsIStreamListener])
 };
 
 var WebContentConverterFactory = {
@@ -74,8 +73,7 @@ var WebContentConverterFactory = {
   },
 
   QueryInterface: XPCOMUtils.generateQI(
-    [Ci.nsIFactory,
-     Ci.nsISupports])
+    [Ci.nsIFactory])
 };
 
 function ServiceInfo(contentType, uri, name) {
@@ -129,8 +127,7 @@ ServiceInfo.prototype = {
   },
 
   QueryInterface: XPCOMUtils.generateQI(
-    [Ci.nsIWebContentHandlerInfo,
-     Ci.nsISupports])
+    [Ci.nsIWebContentHandlerInfo])
 };
 
 function WebContentConverterRegistrar() {