Bug 1649221: Update ChromeUtils.generateQI callers to pass strings. r…

…=mccr8,remote-protocol-reviewers,marionette-reviewers,perftest-reviewers,webcompat-reviewers,geckoview-reviewers,preferences-reviewers,agi,whimboo,Bebe,twisniewski Differential Revision: https://phabricator.services.mozilla.com/D81594
dothq · Jul 10, 2020 · 9d78661 · 9d78661
1 parent 8d808a0
commit 9d78661
Show file tree

Hide file tree

Showing 459 changed files with 1,057 additions and 1,093 deletions.
diff --git a/browser/base/content/browser-data-submission-info-bar.js b/browser/base/content/browser-data-submission-info-bar.js
@@ -125,7 +125,7 @@ var gDataNotificationInfoBar = {
   },
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
   ]),
 };
diff --git a/browser/base/content/browser-fullZoom.js b/browser/base/content/browser-fullZoom.js
@@ -40,9 +40,9 @@ var FullZoom = {
   // nsISupports
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsIContentPrefObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsIContentPrefObserver",
+    "nsISupportsWeakReference",
   ]),
 
   // Initialization & Destruction

diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
@@ -2029,7 +2029,7 @@ var BookmarkingUI = {
     this._uninitView();
   },
 
-  QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]),
+  QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),
 };
 
 var AutoShowBookmarksToolbar = {

diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
@@ -1468,7 +1468,7 @@ var gSync = {
   },
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
   ]),
 };
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -2648,7 +2648,7 @@ const SiteSpecificBrowserUI = {
     document.getElementById("appMenu-ssb-button").hidden = false;
   },
 
-  QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference]),
+  QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference"]),
 };
 
 function HandleAppCommandEvent(evt) {
@@ -5920,7 +5920,7 @@ var TabsProgressListener = {
 function nsBrowserAccess() {}
 
 nsBrowserAccess.prototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIBrowserDOMWindow]),
+  QueryInterface: ChromeUtils.generateQI(["nsIBrowserDOMWindow"]),
 
   _openURIInNewTab(
     aURI,
@@ -8431,8 +8431,8 @@ var RestoreLastSessionObserver = {
   },
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
   ]),
 };
 

diff --git a/browser/base/content/content-refreshblocker.js b/browser/base/content/content-refreshblocker.js
@@ -180,9 +180,9 @@ var RefreshBlocker = {
   },
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIWebProgressListener2,
-    Ci.nsIWebProgressListener,
-    Ci.nsISupportsWeakReference,
+    "nsIWebProgressListener2",
+    "nsIWebProgressListener",
+    "nsISupportsWeakReference",
   ]),
 };
 

diff --git a/browser/base/content/test/chrome/test_aboutCrashed.xhtml b/browser/base/content/test/chrome/test_aboutCrashed.xhtml
@@ -31,8 +31,8 @@
             }
           },
 
-          QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
-                                                  Ci.nsISupportsWeakReference])
+          QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
+                                                  "nsISupportsWeakReference"])
         };
 
         frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor)

diff --git a/browser/base/content/test/chrome/test_aboutRestartRequired.xhtml b/browser/base/content/test/chrome/test_aboutRestartRequired.xhtml
@@ -30,8 +30,8 @@
             }
           },
 
-          QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
-                                                  Ci.nsISupportsWeakReference])
+          QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
+                                                  "nsISupportsWeakReference"])
         };
 
         frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor)

diff --git a/browser/base/content/test/general/browser_bug356571.js b/browser/base/content/test/general/browser_bug356571.js
@@ -25,7 +25,7 @@ var fakePromptServiceFactory = {
 };
 
 var promptService = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
+  QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
   alert() {
     didFail = true;
   },

diff --git a/browser/base/content/test/general/browser_fullscreen-window-open.js b/browser/base/content/test/general/browser_fullscreen-window-open.js
@@ -362,5 +362,5 @@ WindowListener.prototype = {
     domwindow.addEventListener("load", onLoad, true);
   },
   onCloseWindow(aXULWindow) {},
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowMediatorListener]),
+  QueryInterface: ChromeUtils.generateQI(["nsIWindowMediatorListener"]),
 };
diff --git a/browser/base/content/test/general/browser_homeDrop.js b/browser/base/content/test/general/browser_homeDrop.js
@@ -37,7 +37,7 @@ add_task(async function() {
 
     let setHomepagePromise = new Promise(function(resolve) {
       let observer = {
-        QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
+        QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
         observe(subject, topic, data) {
           is(topic, "nsPref:changed", "observed correct topic");
           is(data, HOMEPAGE_PREF, "observed correct data");

diff --git a/browser/base/content/test/pageActions/browser_PageActions_removeExtension.js b/browser/base/content/test/pageActions/browser_PageActions_removeExtension.js
@@ -295,7 +295,7 @@ function mockPromptService() {
   let promptService = {
     // The prompt returns 1 for cancelled and 0 for accepted.
     _response: 0,
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
+    QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
     confirmEx: () => promptService._response,
   };
 

diff --git a/browser/base/content/test/performance/head.js b/browser/base/content/test/performance/head.js
@@ -55,8 +55,8 @@ async function recordReflows(testPromise, win = window) {
     },
 
     QueryInterface: ChromeUtils.generateQI([
-      Ci.nsIReflowObserver,
-      Ci.nsISupportsWeakReference,
+      "nsIReflowObserver",
+      "nsISupportsWeakReference",
     ]),
   };
 

diff --git a/browser/base/content/test/plugins/blocklist_proxy.js b/browser/base/content/test/plugins/blocklist_proxy.js
@@ -20,9 +20,9 @@ var BlocklistProxy = {
   _uuid: null,
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsIBlocklistService,
-    Ci.nsITimerCallback,
+    "nsIObserver",
+    "nsIBlocklistService",
+    "nsITimerCallback",
   ]),
 
   init() {

diff --git a/browser/base/content/test/siteIdentity/browser_ignore_same_page_navigation.js b/browser/base/content/test/siteIdentity/browser_ignore_same_page_navigation.js
@@ -22,8 +22,8 @@ add_task(async function() {
       onStatusChange() {},
 
       QueryInterface: ChromeUtils.generateQI([
-        Ci.nsIWebProgressListener,
-        Ci.nsISupportsWeakReference,
+        "nsIWebProgressListener",
+        "nsISupportsWeakReference",
       ]),
     };
     browser.addProgressListener(progressListener, Ci.nsIWebProgress.NOTIFY_ALL);

diff --git a/browser/base/content/test/siteIdentity/browser_secure_transport_insecure_scheme.js b/browser/base/content/test/siteIdentity/browser_secure_transport_insecure_scheme.js
@@ -129,7 +129,7 @@ add_task(async function() {
   );
   // Configure Firefox to use the proxy.
   let systemProxySettings = {
-    QueryInterface: ChromeUtils.generateQI([Ci.nsISystemProxySettings]),
+    QueryInterface: ChromeUtils.generateQI(["nsISystemProxySettings"]),
     mainThreadOnly: true,
     PACURI: null,
     getProxyForURI: (aSpec, aScheme, aHost, aPort) => {

diff --git a/browser/base/content/test/tabs/browser_e10s_about_process.js b/browser/base/content/test/tabs/browser_e10s_about_process.js
@@ -56,7 +56,7 @@ AboutModule.prototype = {
     return null;
   },
 
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
+  QueryInterface: ChromeUtils.generateQI(["nsIAboutModule"]),
 };
 
 var AboutModuleFactory = {
@@ -71,7 +71,7 @@ var AboutModuleFactory = {
     throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
   },
 
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory]),
+  QueryInterface: ChromeUtils.generateQI(["nsIFactory"]),
 };
 
 add_task(async function init() {

diff --git a/browser/components/BrowserContentHandler.jsm b/browser/components/BrowserContentHandler.jsm
@@ -383,10 +383,10 @@ function nsBrowserContentHandler() {
 nsBrowserContentHandler.prototype = {
   /* nsISupports */
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsICommandLineHandler,
-    Ci.nsIBrowserHandler,
-    Ci.nsIContentHandler,
-    Ci.nsICommandLineValidator,
+    "nsICommandLineHandler",
+    "nsIBrowserHandler",
+    "nsIContentHandler",
+    "nsICommandLineValidator",
   ]),
 
   /* nsICommandLineHandler */

diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
@@ -4169,8 +4169,8 @@ BrowserGlue.prototype = {
   },
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
   ]),
 };
 
@@ -4452,7 +4452,7 @@ function ContentPermissionPrompt() {}
 ContentPermissionPrompt.prototype = {
   classID: Components.ID("{d8903bf6-68d5-4e97-bcd1-e4d3012f721a}"),
 
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionPrompt]),
+  QueryInterface: ChromeUtils.generateQI(["nsIContentPermissionPrompt"]),
 
   /**
    * This implementation of nsIContentPermissionPrompt.prompt ensures
@@ -4873,8 +4873,8 @@ var JawsScreenReaderVersionCheck = {
   },
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
   ]),
 
   observe(subject, topic, data) {
@@ -5722,8 +5722,8 @@ var AboutHomeStartupCache = {
   },
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsICacheEntryOpenallback,
-    Ci.nsIObserver,
+    "nsICacheEntryOpenallback",
+    "nsIObserver",
   ]),
 
   /** MessageListener **/

diff --git a/browser/components/doh/TRRPerformance.jsm b/browser/components/doh/TRRPerformance.jsm
@@ -141,9 +141,7 @@ class DNSLookup {
   }
 }
 
-DNSLookup.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsIDNSListener,
-]);
+DNSLookup.prototype.QueryInterface = ChromeUtils.generateQI(["nsIDNSListener"]);
 
 // A wrapper around a single set of measurements. The required lookups are
 // triggered and the results aggregated before telemetry is sent. If aborted,

diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm
@@ -196,8 +196,8 @@ const TELEMETRY_EVENT_CATEGORY = "downloads";
 
 var PrefObserver = {
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
   ]),
   getPref(name) {
     try {

diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
@@ -2195,7 +2195,7 @@ let ChromeURLBlockPolicy = {
   classDescription: "Policy Engine Content Policy",
   contractID: "@mozilla-org/policy-engine-content-policy-service;1",
   classID: Components.ID("{ba7b9118-cabc-4845-8b26-4215d2a59ed7}"),
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPolicy]),
+  QueryInterface: ChromeUtils.generateQI(["nsIContentPolicy"]),
   createInstance(outer, iid) {
     return this.QueryInterface(iid);
   },

diff --git a/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm b/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
@@ -87,8 +87,8 @@ function WebsiteFilter(blocklist, exceptionlist) {
 
 WebsiteFilter.prototype = {
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
   ]),
 
   observe(subject, topic, data) {

diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
@@ -1457,7 +1457,7 @@ this.tabs = class extends ExtensionAPI {
                     }
                   },
                   QueryInterface: ChromeUtils.generateQI([
-                    Ci.nsIWebProgressListener,
+                    "nsIWebProgressListener",
                   ]),
                 };
 

diff --git a/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js b/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
@@ -457,7 +457,7 @@ add_task(async function browseraction_contextmenu_remove_extension() {
   let { prompt } = Services;
   let promptService = {
     _response: 1,
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
+    QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
     confirmEx: function(...args) {
       promptService._confirmExArgs = args;
       return promptService._response;

diff --git a/browser/components/installerprefs/InstallerPrefs.jsm b/browser/components/installerprefs/InstallerPrefs.jsm
@@ -64,7 +64,7 @@ InstallerPrefs.prototype = {
   classID: Components.ID("{cd8a6995-1f19-4cdd-9ed1-d6263302f594}"),
   contractID: "@mozilla.org/installerprefs;1",
 
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
+  QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
 
   observe(subject, topic, data) {
     switch (topic) {

diff --git a/browser/components/migration/MigrationUtils.jsm b/browser/components/migration/MigrationUtils.jsm
@@ -126,7 +126,7 @@ function getL10n() {
  * 6. For startup-only migrators, override |startupOnlyMigrator|.
  */
 var MigratorPrototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIBrowserProfileMigrator]),
+  QueryInterface: ChromeUtils.generateQI(["nsIBrowserProfileMigrator"]),
 
   /**
    * OVERRIDE IF AND ONLY IF the source supports multiple profiles.

diff --git a/browser/components/migration/ProfileMigrator.jsm b/browser/components/migration/ProfileMigrator.jsm
@@ -12,7 +12,7 @@ function ProfileMigrator() {}
 
 ProfileMigrator.prototype = {
   migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIProfileMigrator]),
+  QueryInterface: ChromeUtils.generateQI(["nsIProfileMigrator"]),
   classDescription: "Profile Migrator",
   contractID: "@mozilla.org/toolkit/profile-migrator;1",
   classID: Components.ID("6F8BB968-C14F-4D6F-9733-6C6737B35DCE"),

diff --git a/browser/components/newtab/AboutNewTabService.jsm b/browser/components/newtab/AboutNewTabService.jsm
@@ -311,8 +311,8 @@ class BaseAboutNewTabService {
 
     this.classID = Components.ID("{cb36c925-3adc-49b3-b720-a5cc49d8a40e}");
     this.QueryInterface = ChromeUtils.generateQI([
-      Ci.nsIAboutNewTabService,
-      Ci.nsIObserver,
+      "nsIAboutNewTabService",
+      "nsIObserver",
     ]);
   }
 

diff --git a/browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm b/browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm
@@ -84,8 +84,8 @@ class AboutWelcomeChild extends JSWindowActorChild {
 
     const listener = {
       QueryInterface: ChromeUtils.generateQI([
-        Ci.nsIWebProgressListener,
-        Ci.nsISupportsWeakReference,
+        "nsIWebProgressListener",
+        "nsISupportsWeakReference",
       ]),
     };
 

diff --git a/browser/components/newtab/lib/PlacesFeed.jsm b/browser/components/newtab/lib/PlacesFeed.jsm
@@ -41,7 +41,7 @@ class Observer {
     this.dispatch = dispatch;
     this.QueryInterface = ChromeUtils.generateQI([
       observerInterface,
-      Ci.nsISupportsWeakReference,
+      "nsISupportsWeakReference",
     ]);
   }
 }

diff --git a/browser/components/payments/PaymentUIService.jsm b/browser/components/payments/PaymentUIService.jsm
@@ -51,7 +51,7 @@ function PaymentUIService() {
 
 PaymentUIService.prototype = {
   classID: Components.ID("{01f8bd55-9017-438b-85ec-7c15d2b35cdc}"),
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
+  QueryInterface: ChromeUtils.generateQI(["nsIPaymentUIService"]),
 
   // nsIPaymentUIService implementation:
 

diff --git a/browser/components/payments/content/paymentDialogWrapper.js b/browser/components/payments/content/paymentDialogWrapper.js
@@ -137,8 +137,8 @@ var paymentDialogWrapper = {
   temporaryStore: null,
 
   QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
   ]),
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -1457,7 +1457,7 @@ this.tabs = class extends ExtensionAPI { @@
                         }
                       },
                       QueryInterface: ChromeUtils.generateQI([
-                        Ci.nsIWebProgressListener,
+                        "nsIWebProgressListener",
                       ]),
                     };
@@ Expand Down @@