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
2020-07-10 23:58:28 +00:00 · 2020-07-10 23:58:28 +00:00 · 9d78661f88
--- 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",
  ]),
 };
--- 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
--- 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 = {
--- 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",
  ]),
 };
--- 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",
  ]),
 };

--- 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",
  ]),
 };

--- 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)
--- 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)
--- 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;
  },
--- 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"]),
 };
--- 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");
--- 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,
  };

--- 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",
    ]),
  };

--- 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() {
--- 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);
--- 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) => {
--- 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() {
--- 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 */
--- 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 **/
--- 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,
--- 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 {
--- 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);
  },
--- 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) {
--- 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",
                  ]),
                };

--- 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;
--- 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) {
--- 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.
--- 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"),
--- 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",
    ]);
  }

--- 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",
      ]),
    };

--- 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",
    ]);
  }
 }
--- 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:

--- 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",
  ]),

  /**
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@ -94,7 +94,7 @@ PlacesController.prototype = {
  // actually organising the trees.
  disableUserActions: false,

-  QueryInterface: ChromeUtils.generateQI([Ci.nsIClipboardOwner]),
+  QueryInterface: ChromeUtils.generateQI(["nsIClipboardOwner"]),

  // nsIClipboardOwner
  LosingOwnership: function PC_LosingOwnership(aXferable) {
--- a/browser/components/places/content/editBookmark.js
+++ b/browser/components/places/content/editBookmark.js
@ -511,7 +511,7 @@ var gEditItemOverlay = {
    }
  },

-  QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]),
+  QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),

  _element(aID) {
    return document.getElementById("editBMPanel_" + aID);
--- a/browser/components/places/content/treeView.js
+++ b/browser/components/places/content/treeView.js
@ -51,9 +51,9 @@ PlacesTreeView.prototype = {
  },

  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsITreeView,
-    Ci.nsINavHistoryResultObserver,
-    Ci.nsISupportsWeakReference,
+    "nsITreeView",
+    "nsINavHistoryResultObserver",
+    "nsISupportsWeakReference",
  ]),

  /**
--- a/browser/components/places/tests/browser/browser_editBookmark_keywords.js
+++ b/browser/components/places/tests/browser/browser_editBookmark_keywords.js
@ -14,7 +14,7 @@ add_task(async function() {
          PlacesUtils.bookmarks.removeObserver(this);
          resolve({ property, value });
        },
-        QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]),
+        QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),
      });
    });
  }
--- a/browser/components/places/tests/browser/browser_views_liveupdate.js
+++ b/browser/components/places/tests/browser/browser_views_liveupdate.js
@ -170,7 +170,7 @@ add_task(async function test() {
 var bookmarksObserver = {
  _notifications: [],

-  QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]),
+  QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),

  handlePlacesEvents(events) {
    for (let { type, parentGuid, guid, index } of events) {
--- a/browser/components/preferences/dialogs/translation.js
+++ b/browser/components/preferences/dialogs/translation.js
@ -71,7 +71,7 @@ Tree.prototype = {
  getCellProperties(row, column) {
    return "";
  },
-  QueryInterface: ChromeUtils.generateQI([Ci.nsITreeView]),
+  QueryInterface: ChromeUtils.generateQI(["nsITreeView"]),
 };

 function Lang(aCode, label) {
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@ -1889,7 +1889,7 @@ var gMainPane = {

  // nsISupports

-  QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
+  QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),

  // nsIObserver

--- a/browser/components/preferences/tests/browser_advanced_update.js
+++ b/browser/components/preferences/tests/browser_advanced_update.js
@ -16,7 +16,7 @@ const mockUpdateManager = {

  _originalClassId: "",

-  QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateManager]),
+  QueryInterface: ChromeUtils.generateQI(["nsIUpdateManager"]),

  createInstance(outer, iiD) {
    if (outer) {
--- a/browser/components/prompts/PromptCollection.jsm
+++ b/browser/components/prompts/PromptCollection.jsm
@ -81,5 +81,5 @@ PromptCollection.prototype.classID = Components.ID(
  "{7913837c-9623-11ea-bb37-0242ac130002}"
 );
 PromptCollection.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsIPromptCollection,
+  "nsIPromptCollection",
 ]);
--- a/browser/components/protocolhandler/WebProtocolHandlerRegistrar.jsm
+++ b/browser/components/protocolhandler/WebProtocolHandlerRegistrar.jsm
@ -175,5 +175,5 @@ WebProtocolHandlerRegistrar.prototype = {
  /**
   * See nsISupports
   */
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProtocolHandlerRegistrar]),
+  QueryInterface: ChromeUtils.generateQI(["nsIWebProtocolHandlerRegistrar"]),
 };
--- a/browser/components/search/content/search-one-offs.js
+++ b/browser/components/search/content/search-one-offs.js
@ -126,8 +126,8 @@ class SearchOneOffs {

    // Add weak referenced observers to invalidate our cached list of engines.
    this.QueryInterface = ChromeUtils.generateQI([
-      Ci.nsIObserver,
-      Ci.nsISupportsWeakReference,
+      "nsIObserver",
+      "nsISupportsWeakReference",
    ]);
    Services.prefs.addObserver("browser.search.hiddenOneOffs", this, true);
    Services.obs.addObserver(this, "browser-search-engine-modified", true);
--- a/browser/components/search/content/searchbar.js
+++ b/browser/components/search/content/searchbar.js
@ -60,7 +60,7 @@
            searchbar.updateDisplay();
          }
        },
-        QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
+        QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
      };

      this._ignoreFocus = false;
--- a/browser/components/sessionstore/ContentRestore.jsm
+++ b/browser/components/sessionstore/ContentRestore.jsm
@ -451,8 +451,8 @@ function HistoryListener(docShell, callback) {
 }
 HistoryListener.prototype = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsISHistoryListener,
-    Ci.nsISupportsWeakReference,
+    "nsISHistoryListener",
+    "nsISupportsWeakReference",
  ]),

  uninstall() {
@ -511,8 +511,8 @@ function ProgressListener(docShell, callbacks) {

 ProgressListener.prototype = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIWebProgressListener,
-    Ci.nsISupportsWeakReference,
+    "nsIWebProgressListener",
+    "nsISupportsWeakReference",
  ]),

  uninstall() {
--- a/browser/components/sessionstore/ContentSessionStore.jsm
+++ b/browser/components/sessionstore/ContentSessionStore.jsm
@ -258,9 +258,9 @@ class SessionHistoryListener extends Handler {
  }
 }
 SessionHistoryListener.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsIWebProgressListener,
-  Ci.nsISHistoryListener,
-  Ci.nsISupportsWeakReference,
+  "nsIWebProgressListener",
+  "nsISHistoryListener",
+  "nsISupportsWeakReference",
 ]);

 /**
--- a/browser/components/sessionstore/SessionStartup.jsm
+++ b/browser/components/sessionstore/SessionStartup.jsm
@ -421,7 +421,7 @@ var SessionStartup = {
  },

  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
  ]),
 };
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@ -546,8 +546,8 @@ Object.freeze(SessionStore);

 var SessionStoreInternal = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
  ]),

  _globalState: new GlobalState(),
@ -1005,8 +1005,8 @@ var SessionStoreInternal = {
    }
    SHistoryListener.prototype = {
      QueryInterface: ChromeUtils.generateQI([
-        Ci.nsISHistoryListener,
-        Ci.nsISupportsWeakReference,
+        "nsISHistoryListener",
+        "nsISupportsWeakReference",
      ]),

      notifySHistoryChanges(index) {
@ -1124,8 +1124,8 @@ var SessionStoreInternal = {
    }
    SHistoryListener.prototype = {
      QueryInterface: ChromeUtils.generateQI([
-        Ci.nsISHistoryListener,
-        Ci.nsISupportsWeakReference,
+        "nsISHistoryListener",
+        "nsISupportsWeakReference",
      ]),

      uninstall() {
--- a/browser/components/sessionstore/test/browser_async_remove_tab.js
+++ b/browser/components/sessionstore/test/browser_async_remove_tab.js
@ -63,8 +63,8 @@ function promiseNewLocationAndHistoryEntryReplaced(tab, snippet) {
        },

        QueryInterface: ChromeUtils.generateQI([
-          Ci.nsISHistoryListener,
-          Ci.nsISupportsWeakReference,
+          "nsISHistoryListener",
+          "nsISupportsWeakReference",
        ]),
      };

--- a/browser/components/sessionstore/test/browser_not_collect_when_idle.js
+++ b/browser/components/sessionstore/test/browser_not_collect_when_idle.js
@ -25,7 +25,7 @@ var idleService = {
    }
  },

-  QueryInterface: ChromeUtils.generateQI([Ci.nsIIdleService]),
+  QueryInterface: ChromeUtils.generateQI(["nsIIdleService"]),
  idleTime: 19999,

  addIdleObserver(observer, time) {
--- a/browser/components/sessionstore/test/browser_parentProcessRestoreHash.js
+++ b/browser/components/sessionstore/test/browser_parentProcessRestoreHash.js
@ -11,7 +11,7 @@ const TESTCLASSID = "78742c04-3630-448c-9be3-6c5070f062de";
 const TESTURL = "about:testpageforsessionrestore#foo";

 let TestAboutPage = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
+  QueryInterface: ChromeUtils.generateQI(["nsIAboutModule"]),
  getURIFlags(aURI) {
    // No CAN_ or MUST_LOAD_IN_CHILD means this loads in the parent:
    return (
--- a/browser/components/sessionstore/test/head.js
+++ b/browser/components/sessionstore/test/head.js
@ -675,8 +675,8 @@ function promiseOnHistoryReplaceEntryInChild(browser) {
        },

        QueryInterface: ChromeUtils.generateQI([
-          Ci.nsISHistoryListener,
-          Ci.nsISupportsWeakReference,
+          "nsISHistoryListener",
+          "nsISupportsWeakReference",
        ]),
      };

--- a/browser/components/ssb/SiteSpecificBrowserService.jsm
+++ b/browser/components/ssb/SiteSpecificBrowserService.jsm
@ -904,5 +904,5 @@ class SSBCommandLineHandler {
 }

 SSBCommandLineHandler.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsICommandLineHandler,
+  "nsICommandLineHandler",
 ]);
--- a/browser/components/ssb/content/ssb.js
+++ b/browser/components/ssb/content/ssb.js
@ -91,8 +91,8 @@ class ProgressListener {
 }

 ProgressListener.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsIWebProgressListener,
-  Ci.nsISupportsWeakReference,
+  "nsIWebProgressListener",
+  "nsISupportsWeakReference",
 ]);

 class BrowserDOMWindow {
@ -255,7 +255,7 @@ class BrowserDOMWindow {
 }

 BrowserDOMWindow.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsIBrowserDOMWindow,
+  "nsIBrowserDOMWindow",
 ]);

 window.addEventListener("DOMContentLoaded", init, true);
--- a/browser/components/tests/browser/browser_contentpermissionprompt.js
+++ b/browser/components/tests/browser/browser_contentpermissionprompt.js
@ -31,7 +31,7 @@ function MockContentPermissionType(type) {
 }

 MockContentPermissionType.prototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionType]),
+  QueryInterface: ChromeUtils.generateQI(["nsIContentPermissionType"]),
  // We expose the wrappedJSObject so that we can be sure
  // in some of our tests that we're passing the right
  // nsIContentPermissionType around.
@ -54,7 +54,7 @@ function MockContentPermissionRequest(typesArray) {
 }

 MockContentPermissionRequest.prototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionRequest]),
+  QueryInterface: ChromeUtils.generateQI(["nsIContentPermissionRequest"]),
  // We expose the wrappedJSObject so that we can be sure
  // in some of our tests that we're passing the right
  // nsIContentPermissionRequest around.
--- a/browser/components/tests/browser/browser_initial_tab_remoteType.js
+++ b/browser/components/tests/browser/browser_initial_tab_remoteType.js
@ -154,7 +154,7 @@ function constructOnePageCmdLine(aURL) {
      return Services.io.newURI(this._arg);
    },

-    QueryInterface: ChromeUtils.generateQI([Ci.nsICommandLine]),
+    QueryInterface: ChromeUtils.generateQI(["nsICommandLine"]),
  };
 }

--- a/browser/components/tests/startupRecorder.js
+++ b/browser/components/tests/startupRecorder.js
@ -76,7 +76,7 @@ function startupRecorder() {
 startupRecorder.prototype = {
  classID: Components.ID("{11c095b2-e42e-4bdf-9dd0-aed87595f6a4}"),

-  QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
+  QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),

  record(name) {
    ChromeUtils.addProfilerMarker("startupRecorder:" + name);
--- a/browser/components/touchbar/MacTouchBar.js
+++ b/browser/components/touchbar/MacTouchBar.js
@ -499,7 +499,7 @@ const helperProto = TouchBarHelper.prototype;
 helperProto.classDescription = "Services the Mac Touch Bar";
 helperProto.classID = Components.ID("{ea109912-3acc-48de-b679-c23b6a122da5}");
 helperProto.contractID = "@mozilla.org/widget/touchbarhelper;1";
-helperProto.QueryInterface = ChromeUtils.generateQI([Ci.nsITouchBarHelper]);
+helperProto.QueryInterface = ChromeUtils.generateQI(["nsITouchBarHelper"]);
 helperProto._l10n = new Localization(["browser/touchbar/touchbar.ftl"]);

 /**
@ -639,7 +639,7 @@ const inputProto = TouchBarInput.prototype;
 inputProto.classDescription = "Represents an input on the Mac Touch Bar";
 inputProto.classID = Components.ID("{77441d17-f29c-49d7-982f-f20a5ab5a900}");
 inputProto.contractID = "@mozilla.org/widget/touchbarinput;1";
-inputProto.QueryInterface = ChromeUtils.generateQI([Ci.nsITouchBarInput]);
+inputProto.QueryInterface = ChromeUtils.generateQI(["nsITouchBarInput"]);

 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
  TouchBarHelper,
--- a/browser/components/uitour/test/browser_UITour_defaultBrowser.js
+++ b/browser/components/uitour/test/browser_UITour_defaultBrowser.js
@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(

 function MockShellService() {}
 MockShellService.prototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIShellService]),
+  QueryInterface: ChromeUtils.generateQI(["nsIShellService"]),
  isDefaultBrowser(aStartupCheck, aForAllTypes) {
    return false;
  },
--- a/browser/components/urlbar/UrlbarPrefs.jsm
+++ b/browser/components/urlbar/UrlbarPrefs.jsm
@ -211,8 +211,8 @@ class Preferences {
  constructor() {
    this._map = new Map();
    this.QueryInterface = ChromeUtils.generateQI([
-      Ci.nsIObserver,
-      Ci.nsISupportsWeakReference,
+      "nsIObserver",
+      "nsISupportsWeakReference",
    ]);
    Services.prefs.addObserver(PREF_URLBAR_BRANCH, this, true);
    for (let pref of PREF_OTHER_DEFAULTS.keys()) {
--- a/browser/components/urlbar/UrlbarSearchUtils.jsm
+++ b/browser/components/urlbar/UrlbarSearchUtils.jsm
@ -24,8 +24,8 @@ class SearchUtils {
  constructor() {
    this._refreshEnginesByAliasPromise = Promise.resolve();
    this.QueryInterface = ChromeUtils.generateQI([
-      Ci.nsIObserver,
-      Ci.nsISupportsWeakReference,
+      "nsIObserver",
+      "nsISupportsWeakReference",
    ]);
  }

--- a/browser/components/urlbar/tests/browser/browser_speculative_connect_not_with_client_cert.js
+++ b/browser/components/urlbar/tests/browser/browser_speculative_connect_not_with_client_cert.js
@ -47,7 +47,7 @@ const clientAuthDialogs = {
    return true;
  },

-  QueryInterface: ChromeUtils.generateQI([Ci.nsIClientAuthDialogs]),
+  QueryInterface: ChromeUtils.generateQI(["nsIClientAuthDialogs"]),
 };

 function startServer(cert) {
--- a/browser/extensions/formautofill/FormAutofillContent.jsm
+++ b/browser/extensions/formautofill/FormAutofillContent.jsm
@ -145,7 +145,7 @@ AutofillProfileAutoCompleteSearch.prototype = {
  classID: Components.ID("4f9f1e4c-7f2c-439e-9c9e-566b68bc187d"),
  contractID: "@mozilla.org/autocomplete/search;1?name=autofill-profiles",
  classDescription: "AutofillProfileAutoCompleteSearch",
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteSearch]),
+  QueryInterface: ChromeUtils.generateQI(["nsIAutoCompleteSearch"]),

  // Begin nsIAutoCompleteSearch implementation

@ -310,7 +310,7 @@ AutofillProfileAutoCompleteSearch.prototype = {
 };

 let ProfileAutocomplete = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
+  QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),

  lastProfileAutoCompleteResult: null,
  lastProfileAutoCompleteFocusedInput: null,
--- a/browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
+++ b/browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
@ -43,7 +43,7 @@ class ProfileAutoCompleteResult {
    log.debug("Constructing new ProfileAutoCompleteResult:", [...arguments]);

    // nsISupports
-    this.QueryInterface = ChromeUtils.generateQI([Ci.nsIAutoCompleteResult]);
+    this.QueryInterface = ChromeUtils.generateQI(["nsIAutoCompleteResult"]);

    // The user's query string
    this.searchString = searchString;
--- a/browser/extensions/webcompat/about-compat/AboutCompat.jsm
+++ b/browser/extensions/webcompat/about-compat/AboutCompat.jsm
@ -17,7 +17,7 @@ function AboutCompat() {
  );
 }
 AboutCompat.prototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
+  QueryInterface: ChromeUtils.generateQI(["nsIAboutModule"]),
  getURIFlags() {
    return Ci.nsIAboutModule.URI_MUST_LOAD_IN_EXTENSION_PROCESS;
  },
--- a/browser/fxr/content/fxrui.js
+++ b/browser/fxr/content/fxrui.js
@ -96,8 +96,8 @@ function setupBrowser() {
    browser.addProgressListener(
      {
        QueryInterface: ChromeUtils.generateQI([
-          Ci.nsIWebProgressListener,
-          Ci.nsISupportsWeakReference,
+          "nsIWebProgressListener",
+          "nsISupportsWeakReference",
        ]),
        onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
          // When URL changes, update the URL in the URL bar and update
--- a/browser/modules/AboutNewTab.jsm
+++ b/browser/modules/AboutNewTab.jsm
@ -26,8 +26,8 @@ const BROWSER_READY_NOTIFICATION = "sessionstore-windows-restored";

 const AboutNewTab = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
  ]),

  // AboutNewTab
--- a/browser/modules/BrowserUsageTelemetry.jsm
+++ b/browser/modules/BrowserUsageTelemetry.jsm
@ -414,8 +414,8 @@ let URICountListener = {
  },

  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIWebProgressListener,
-    Ci.nsISupportsWeakReference,
+    "nsIWebProgressListener",
+    "nsISupportsWeakReference",
  ]),
 };

@ -463,8 +463,8 @@ let BrowserUsageTelemetry = {
  },

  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
  ]),

  uninit() {
--- a/browser/modules/Sanitizer.jsm
+++ b/browser/modules/Sanitizer.jsm
@ -341,8 +341,8 @@ var Sanitizer = {
  },

  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
  ]),

  // This method is meant to be used by tests.
--- a/browser/modules/SiteDataManager.jsm
+++ b/browser/modules/SiteDataManager.jsm
@ -116,8 +116,8 @@ var SiteDataManager = {
        },

        QueryInterface: ChromeUtils.generateQI([
-          Ci.nsICacheStorageConsumptionObserver,
-          Ci.nsISupportsWeakReference,
+          "nsICacheStorageConsumptionObserver",
+          "nsISupportsWeakReference",
        ]),
      };

--- a/browser/modules/SitePermissions.jsm
+++ b/browser/modules/SitePermissions.jsm
@ -186,8 +186,8 @@ const GloballyBlockedPermissions = {
    browser.addProgressListener(
      {
        QueryInterface: ChromeUtils.generateQI([
-          Ci.nsIWebProgressListener,
-          Ci.nsISupportsWeakReference,
+          "nsIWebProgressListener",
+          "nsISupportsWeakReference",
        ]),
        onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
          let hasLeftPage =
--- a/browser/modules/TabUnloader.jsm
+++ b/browser/modules/TabUnloader.jsm
@ -31,8 +31,8 @@ var TabUnloader = {
  },

  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
  ]),
 };

--- a/browser/modules/WindowsJumpLists.jsm
+++ b/browser/modules/WindowsJumpLists.jsm
@ -84,7 +84,7 @@ XPCOMUtils.defineLazyGetter(this, "gHistoryObserver", function() {
    onDeleteURI() {},
    onPageChanged() {},
    onDeleteVisits() {},
-    QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver]),
+    QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
  });
 });

--- a/browser/modules/WindowsPreviewPerTab.jsm
+++ b/browser/modules/WindowsPreviewPerTab.jsm
@ -173,7 +173,7 @@ function PreviewController(win, tab) {
 }

 PreviewController.prototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsITaskbarPreviewController]),
+  QueryInterface: ChromeUtils.generateQI(["nsITaskbarPreviewController"]),

  destroy() {
    this.tab.removeEventListener("TabAttrModified", this);
@ -904,9 +904,9 @@ var AeroPeek = {
  },

  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsISupportsWeakReference,
-    Ci.nsINavHistoryObserver,
-    Ci.nsIObserver,
+    "nsISupportsWeakReference",
+    "nsINavHistoryObserver",
+    "nsIObserver",
  ]),
 };

--- a/browser/modules/test/browser/browser_UsageTelemetry_domains.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_domains.js
@ -33,8 +33,8 @@ function browserLocationChanged(browser) {
        }
      },
      QueryInterface: ChromeUtils.generateQI([
-        Ci.nsIWebProgressListener,
-        Ci.nsIWebProgressListener2,
+        "nsIWebProgressListener",
+        "nsIWebProgressListener2",
      ]),
    };
    const filter = Cc[
--- a/browser/modules/test/browser/formValidation/browser_form_validation.js
+++ b/browser/modules/test/browser/formValidation/browser_form_validation.js
@ -58,7 +58,7 @@ function checkPopupHide() {
 }

 var gObserver = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIFormSubmitObserver]),
+  QueryInterface: ChromeUtils.generateQI(["nsIFormSubmitObserver"]),

  notifyInvalidSubmit(aFormElement, aInvalidElements) {},
 };
--- a/browser/modules/test/browser/head.js
+++ b/browser/modules/test/browser/head.js
@ -81,7 +81,7 @@ let typeInSearchField = async function(browser, text, fieldName) {
 function makeMockPermissionRequest(browser) {
  let type = {
    options: Cc["@mozilla.org/array;1"].createInstance(Ci.nsIArray),
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionType]),
+    QueryInterface: ChromeUtils.generateQI(["nsIContentPermissionType"]),
  };
  let types = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
  types.appendElement(type);
@ -103,7 +103,7 @@ function makeMockPermissionRequest(browser) {
    getDelegatePrincipal(aType) {
      return principal;
    },
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionRequest]),
+    QueryInterface: ChromeUtils.generateQI(["nsIContentPermissionRequest"]),
  };

  // In the e10s-case, nsIContentPermissionRequest will have
--- a/chrome/test/unit/test_no_remote_registration.js
+++ b/chrome/test/unit/test_no_remote_registration.js
@ -20,7 +20,7 @@ ProtocolHandler.prototype = {
  newChannel() {
    throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
  },
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIProtocolHandler]),
+  QueryInterface: ChromeUtils.generateQI(["nsIProtocolHandler"]),
 };

 var testProtocols = [
--- a/devtools/client/jsonview/Sniffer.jsm
+++ b/devtools/client/jsonview/Sniffer.jsm
@ -63,5 +63,5 @@ class Sniffer {
 }

 Sniffer.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsIContentSniffer,
+  "nsIContentSniffer",
 ]);
--- a/devtools/client/jsonview/converter-child.js
+++ b/devtools/client/jsonview/converter-child.js
@ -49,9 +49,9 @@ function Converter() {}

 Converter.prototype = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIStreamConverter,
-    Ci.nsIStreamListener,
-    Ci.nsIRequestObserver,
+    "nsIStreamConverter",
+    "nsIStreamListener",
+    "nsIRequestObserver",
  ]),

  get wrappedJSObject() {
--- a/devtools/client/jsonview/test/browser_jsonview_data_blocking.js
+++ b/devtools/client/jsonview/test/browser_jsonview_data_blocking.js
@ -72,14 +72,14 @@ add_task(async function test_converter_abort_should_stop_data_sending() {
  // Stub all the things.
  const chan = {
    QueryInterface: ChromeUtils.generateQI([
-      Ci.nsIChannel,
-      Ci.nsIWritablePropertyBag,
+      "nsIChannel",
+      "nsIWritablePropertyBag",
    ]),
    URI: Services.io.newURI("data:application/json,{}"),
    // loadinfo is builtinclass, need to actually have one:
    loadInfo,
    notificationCallbacks: {
-      QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor]),
+      QueryInterface: ChromeUtils.generateQI(["nsIInterfaceRequestor"]),
      getInterface() {
        // We want a loadcontext here, which is also builtinclass, can't stub.
        return docShell;
@ -90,7 +90,7 @@ add_task(async function test_converter_abort_should_stop_data_sending() {
  };
  let onStartFired = false;
  const listener = {
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamListener]),
+    QueryInterface: ChromeUtils.generateQI(["nsIStreamListener"]),
    onStartRequest() {
      onStartFired = true;
      // This should force the converter to abort, too:
@ -130,14 +130,14 @@ add_task(async function test_converter_principal_needs_matching() {
  // Stub all the things.
  const chan = {
    QueryInterface: ChromeUtils.generateQI([
-      Ci.nsIChannel,
-      Ci.nsIWritablePropertyBag,
+      "nsIChannel",
+      "nsIWritablePropertyBag",
    ]),
    URI: Services.io.newURI("data:application/json,{}"),
    // loadinfo is builtinclass, need to actually have one:
    loadInfo,
    notificationCallbacks: {
-      QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor]),
+      QueryInterface: ChromeUtils.generateQI(["nsIInterfaceRequestor"]),
      getInterface() {
        // We want a loadcontext here, which is also builtinclass, can't stub.
        return docShell;
@ -151,7 +151,7 @@ add_task(async function test_converter_principal_needs_matching() {
  };
  let onStartFired = false;
  const listener = {
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamListener]),
+    QueryInterface: ChromeUtils.generateQI(["nsIStreamListener"]),
    onStartRequest() {
      onStartFired = true;
    },
--- a/devtools/client/shared/test/shared-head.js
+++ b/devtools/client/shared/test/shared-head.js
@ -232,7 +232,7 @@ registerCleanupFunction(function() {
 * Watch console messages for failed propType definitions in React components.
 */
 const ConsoleObserver = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
+  QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),

  observe: function(subject) {
    const message = subject.wrappedJSObject.arguments[0];
--- a/devtools/client/webconsole/test/browser/browser_webconsole_network_requests_from_chrome.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_network_requests_from_chrome.js
@ -12,7 +12,7 @@ add_task(async function() {
  // Start a listener on the console service.
  let good = true;
  const listener = {
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
+    QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
    observe: function(subject) {
      if (
        subject instanceof Ci.nsIScriptError &&
--- a/devtools/client/webconsole/test/browser/browser_webconsole_observer_notifications.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_observer_notifications.js
@ -23,7 +23,7 @@ add_task(async function() {

 function setupObserver() {
  const observer = {
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
+    QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),

    observe: function observe(subject, topic) {
      subject = subject.QueryInterface(Ci.nsISupportsString);
--- a/devtools/server/actors/addon/webextension-inspected-window.js
+++ b/devtools/server/actors/addon/webextension-inspected-window.js
@ -125,8 +125,8 @@ function CustomizedReload(params) {

 CustomizedReload.prototype = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIWebProgressListener,
-    Ci.nsISupportsWeakReference,
+    "nsIWebProgressListener",
+    "nsISupportsWeakReference",
  ]),
  get window() {
    return this.docShell.DOMWindow;
--- a/devtools/server/actors/highlighters.js
+++ b/devtools/server/actors/highlighters.js
@ -376,8 +376,8 @@ HighlighterEnvironment.prototype = {
    const self = this;
    this.listener = {
      QueryInterface: ChromeUtils.generateQI([
-        Ci.nsIWebProgressListener,
-        Ci.nsISupportsWeakReference,
+        "nsIWebProgressListener",
+        "nsISupportsWeakReference",
      ]),

      onStateChange: function(progress, request, flag) {
--- a/devtools/server/actors/network-monitor/channel-event-sink.js
+++ b/devtools/server/actors/network-monitor/channel-event-sink.js
@ -24,7 +24,7 @@ function ChannelEventSink() {
 }

 ChannelEventSink.prototype = {
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIChannelEventSink]),
+  QueryInterface: ChromeUtils.generateQI(["nsIChannelEventSink"]),

  registerCollector(collector) {
    this.collectors.add(collector);
--- a/devtools/server/actors/network-monitor/network-response-listener.js
+++ b/devtools/server/actors/network-monitor/network-response-listener.js
@ -69,10 +69,10 @@ exports.NetworkResponseListener = NetworkResponseListener;

 NetworkResponseListener.prototype = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIStreamListener,
-    Ci.nsIInputStreamCallback,
-    Ci.nsIRequestObserver,
-    Ci.nsIInterfaceRequestor,
+    "nsIStreamListener",
+    "nsIInputStreamCallback",
+    "nsIRequestObserver",
+    "nsIInterfaceRequestor",
  ]),

  // nsIInterfaceRequestor implementation
--- a/devtools/server/actors/reflow.js
+++ b/devtools/server/actors/reflow.js
@ -24,7 +24,6 @@
 *   These dedicated classes are used by the LayoutChangesObserver.
 */

-const { Ci } = require("chrome");
 const ChromeUtils = require("ChromeUtils");
 const protocol = require("devtools/shared/protocol");
 const EventEmitter = require("devtools/shared/event-emitter");
@ -460,8 +459,8 @@ class ReflowObserver extends Observable {
 }

 ReflowObserver.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsIReflowObserver,
-  Ci.nsISupportsWeakReference,
+  "nsIReflowObserver",
+  "nsISupportsWeakReference",
 ]);

 /**
--- a/devtools/server/actors/resources/platform-messages.js
+++ b/devtools/server/actors/resources/platform-messages.js
@ -35,7 +35,7 @@ class PlatformMessageWatcher {

    // Create the consoleListener.
    const listener = {
-      QueryInterface: ChromeUtils.generateQI([Ci.nsIConsoleListener]),
+      QueryInterface: ChromeUtils.generateQI(["nsIConsoleListener"]),
      observe(message) {
        if (!shouldHandleMessage(message)) {
          return;
--- a/devtools/server/actors/targets/browsing-context.js
+++ b/devtools/server/actors/targets/browsing-context.js
@ -1662,8 +1662,8 @@ function DebuggerProgressListener(targetActor) {

 DebuggerProgressListener.prototype = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIWebProgressListener,
-    Ci.nsISupportsWeakReference,
+    "nsIWebProgressListener",
+    "nsISupportsWeakReference",
  ]),

  destroy() {
--- a/devtools/server/actors/webconsole/content-process-forward.js
+++ b/devtools/server/actors/webconsole/content-process-forward.js
@ -43,8 +43,8 @@ function ContentProcessForward() {
 }
 ContentProcessForward.prototype = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIObserver",
+    "nsISupportsWeakReference",
  ]),

  receiveMessage(message) {
--- a/devtools/server/actors/webconsole/listeners/console-file-activity.js
+++ b/devtools/server/actors/webconsole/listeners/console-file-activity.js
@ -34,8 +34,8 @@ ConsoleFileActivityListener.prototype = {
  _webProgress: null,

  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIWebProgressListener,
-    Ci.nsISupportsWeakReference,
+    "nsIWebProgressListener",
+    "nsISupportsWeakReference",
  ]),

  /**
--- a/devtools/server/actors/webconsole/listeners/console-reflow.js
+++ b/devtools/server/actors/webconsole/listeners/console-reflow.js
@ -4,7 +4,7 @@

 "use strict";

-const { Ci, components } = require("chrome");
+const { components } = require("chrome");
 const ChromeUtils = require("ChromeUtils");

 /**
@ -29,8 +29,8 @@ exports.ConsoleReflowListener = ConsoleReflowListener;

 ConsoleReflowListener.prototype = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIReflowObserver,
-    Ci.nsISupportsWeakReference,
+    "nsIReflowObserver",
+    "nsISupportsWeakReference",
  ]),
  docshell: null,
  listener: null,
--- a/devtools/server/actors/worker/service-worker-registration.js
+++ b/devtools/server/actors/worker/service-worker-registration.js
@ -4,7 +4,6 @@

 "use strict";

-const { Ci } = require("chrome");
 const ChromeUtils = require("ChromeUtils");
 const Services = require("Services");
 const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
@ -201,7 +200,7 @@ const ServiceWorkerRegistrationActor = protocol.ActorClassWithSpec(
          console.error("Failed to unregister the service worker for " + scope);
        },
        QueryInterface: ChromeUtils.generateQI([
-          Ci.nsIServiceWorkerUnregisterCallback,
+          "nsIServiceWorkerUnregisterCallback",
        ]),
      };
      swm.propagateUnregister(principal, unregisterCallback, scope);
--- a/devtools/shared/webconsole/throttle.js
+++ b/devtools/shared/webconsole/throttle.js
@ -48,8 +48,8 @@ function NetworkThrottleListener(queue) {

 NetworkThrottleListener.prototype = {
  QueryInterface: ChromeUtils.generateQI([
-    Ci.nsIStreamListener,
-    Ci.nsIInterfaceRequestor,
+    "nsIStreamListener",
+    "nsIInterfaceRequestor",
  ]),

  /**
--- a/devtools/startup/DevToolsStartup.jsm
+++ b/devtools/startup/DevToolsStartup.jsm
@ -1251,7 +1251,7 @@ DevToolsStartup.prototype = {
  /* eslint-disable max-len */

  classID: Components.ID("{9e9a9283-0ce9-4e4a-8f1c-ba129a032c32}"),
-  QueryInterface: ChromeUtils.generateQI([Ci.nsICommandLineHandler]),
+  QueryInterface: ChromeUtils.generateQI(["nsICommandLineHandler"]),
 };

 /**
--- a/docshell/base/URIFixup.jsm
+++ b/docshell/base/URIFixup.jsm
@ -181,8 +181,8 @@ XPCOMUtils.defineLazyGetter(this, "knownDomains", () => {
      }
    },
    QueryInterface: ChromeUtils.generateQI([
-      Ci.nsIObserver,
-      Ci.nsISupportsWeakReference,
+      "nsIObserver",
+      "nsISupportsWeakReference",
    ]),
  };
  Services.prefs.addObserver(branch, domains._observer, true);
@ -239,8 +239,8 @@ XPCOMUtils.defineLazyGetter(this, "knownSuffixes", () => {
      }
    },
    QueryInterface: ChromeUtils.generateQI([
-      Ci.nsIObserver,
-      Ci.nsISupportsWeakReference,
+      "nsIObserver",
+      "nsISupportsWeakReference",
    ]),
  };
  Services.prefs.addObserver(branch, suffixes._observer, true);
@ -556,7 +556,7 @@ URIFixup.prototype = {

  classID: Components.ID("{c6cf88b7-452e-47eb-bdc9-86e3561648ef}"),
  _xpcom_factory: XPCOMUtils.generateSingletonFactory(URIFixup),
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIURIFixup]),
+  QueryInterface: ChromeUtils.generateQI(["nsIURIFixup"]),
 };

 function URIFixupInfo(originalInput = "") {
@ -621,7 +621,7 @@ URIFixupInfo.prototype = {
  },

  classID: Components.ID("{33d75835-722f-42c0-89cc-44f328e56a86}"),
-  QueryInterface: ChromeUtils.generateQI([Ci.nsIURIFixupInfo]),
+  QueryInterface: ChromeUtils.generateQI(["nsIURIFixupInfo"]),
 };

 // Helpers
--- a/docshell/test/browser/Bug422543Child.jsm
+++ b/docshell/test/browser/Bug422543Child.jsm
@ -26,8 +26,8 @@ class SHistoryListener {
  OnHistoryReplaceEntry() {}
 }
 SHistoryListener.prototype.QueryInterface = ChromeUtils.generateQI([
-  Ci.nsISHistoryListener,
-  Ci.nsISupportsWeakReference,
+  "nsISHistoryListener",
+  "nsISupportsWeakReference",
 ]);

 let listeners;
--- a/Показать больше
+++ b/Показать больше