nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

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

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D81594
This commit is contained in:
Kris Maglione 2020-07-10 23:58:28 +00:00
parent 8d808a0da4
commit 9d78661f88
459 changed files with 1057 additions and 1093 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
browser/base/content/browser-data-submission-info-bar.js
View file

@ -125,7 +125,7 @@ var gDataNotificationInfoBar = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

6
browser/base/content/browser-fullZoom.js
View file

@ -40,9 +40,9 @@ var FullZoom = {
// nsISupports // nsISupports
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsIContentPrefObserver, "nsIContentPrefObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
// Initialization & Destruction // Initialization & Destruction

2
browser/base/content/browser-places.js
View file

@ -2029,7 +2029,7 @@ var BookmarkingUI = {
this._uninitView(); this._uninitView();
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]), QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),
}; };
var AutoShowBookmarksToolbar = { var AutoShowBookmarksToolbar = {

4
browser/base/content/browser-sync.js
View file

@ -1468,7 +1468,7 @@ var gSync = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

8
browser/base/content/browser.js
View file

@ -2648,7 +2648,7 @@ const SiteSpecificBrowserUI = {
document.getElementById("appMenu-ssb-button").hidden = false; document.getElementById("appMenu-ssb-button").hidden = false;
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference]), QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference"]),
}; };
function HandleAppCommandEvent(evt) { function HandleAppCommandEvent(evt) {
@ -5920,7 +5920,7 @@ var TabsProgressListener = {
function nsBrowserAccess() {} function nsBrowserAccess() {}
nsBrowserAccess.prototype = { nsBrowserAccess.prototype = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIBrowserDOMWindow]), QueryInterface: ChromeUtils.generateQI(["nsIBrowserDOMWindow"]),
_openURIInNewTab( _openURIInNewTab(
aURI, aURI,
@ -8431,8 +8431,8 @@ var RestoreLastSessionObserver = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

6
browser/base/content/content-refreshblocker.js
View file

@ -180,9 +180,9 @@ var RefreshBlocker = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener2, "nsIWebProgressListener2",
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

4
browser/base/content/test/chrome/test_aboutCrashed.xhtml
View file

@ -31,8 +31,8 @@
} }
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener, QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
Ci.nsISupportsWeakReference]) "nsISupportsWeakReference"])
}; };
frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor) frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor)

4
browser/base/content/test/chrome/test_aboutRestartRequired.xhtml
View file

@ -30,8 +30,8 @@
} }
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener, QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
Ci.nsISupportsWeakReference]) "nsISupportsWeakReference"])
}; };
frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor) frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor)

2
browser/base/content/test/general/browser_bug356571.js
View file

@ -25,7 +25,7 @@ var fakePromptServiceFactory = {
}; };
var promptService = { var promptService = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]), QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
alert() { alert() {
didFail = true; didFail = true;
}, },

2
browser/base/content/test/general/browser_fullscreen-window-open.js
View file

@ -362,5 +362,5 @@ WindowListener.prototype = {
domwindow.addEventListener("load", onLoad, true); domwindow.addEventListener("load", onLoad, true);
}, },
onCloseWindow(aXULWindow) {}, onCloseWindow(aXULWindow) {},
QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowMediatorListener]), QueryInterface: ChromeUtils.generateQI(["nsIWindowMediatorListener"]),
}; };

2
browser/base/content/test/general/browser_homeDrop.js
View file

@ -37,7 +37,7 @@ add_task(async function() {
let setHomepagePromise = new Promise(function(resolve) { let setHomepagePromise = new Promise(function(resolve) {
let observer = { let observer = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
observe(subject, topic, data) { observe(subject, topic, data) {
is(topic, "nsPref:changed", "observed correct topic"); is(topic, "nsPref:changed", "observed correct topic");
is(data, HOMEPAGE_PREF, "observed correct data"); is(data, HOMEPAGE_PREF, "observed correct data");

2
browser/base/content/test/pageActions/browser_PageActions_removeExtension.js
View file

@ -295,7 +295,7 @@ function mockPromptService() {
let promptService = { let promptService = {
// The prompt returns 1 for cancelled and 0 for accepted. // The prompt returns 1 for cancelled and 0 for accepted.
_response: 0, _response: 0,
QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]), QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
confirmEx: () => promptService._response, confirmEx: () => promptService._response,
}; };

4
browser/base/content/test/performance/head.js
View file

@ -55,8 +55,8 @@ async function recordReflows(testPromise, win = window) {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIReflowObserver, "nsIReflowObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

6
browser/base/content/test/plugins/blocklist_proxy.js
View file

@ -20,9 +20,9 @@ var BlocklistProxy = {
_uuid: null, _uuid: null,
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsIBlocklistService, "nsIBlocklistService",
Ci.nsITimerCallback, "nsITimerCallback",
]), ]),
init() { init() {

4
browser/base/content/test/siteIdentity/browser_ignore_same_page_navigation.js
View file

@ -22,8 +22,8 @@ add_task(async function() {
onStatusChange() {}, onStatusChange() {},
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };
browser.addProgressListener(progressListener, Ci.nsIWebProgress.NOTIFY_ALL); browser.addProgressListener(progressListener, Ci.nsIWebProgress.NOTIFY_ALL);

2
browser/base/content/test/siteIdentity/browser_secure_transport_insecure_scheme.js
View file

@ -129,7 +129,7 @@ add_task(async function() {
); );
// Configure Firefox to use the proxy. // Configure Firefox to use the proxy.
let systemProxySettings = { let systemProxySettings = {
QueryInterface: ChromeUtils.generateQI([Ci.nsISystemProxySettings]), QueryInterface: ChromeUtils.generateQI(["nsISystemProxySettings"]),
mainThreadOnly: true, mainThreadOnly: true,
PACURI: null, PACURI: null,
getProxyForURI: (aSpec, aScheme, aHost, aPort) => { getProxyForURI: (aSpec, aScheme, aHost, aPort) => {

4
browser/base/content/test/tabs/browser_e10s_about_process.js
View file

@ -56,7 +56,7 @@ AboutModule.prototype = {
return null; return null;
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]), QueryInterface: ChromeUtils.generateQI(["nsIAboutModule"]),
}; };
var AboutModuleFactory = { var AboutModuleFactory = {
@ -71,7 +71,7 @@ var AboutModuleFactory = {
throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED); throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory]), QueryInterface: ChromeUtils.generateQI(["nsIFactory"]),
}; };
add_task(async function init() { add_task(async function init() {

8
browser/components/BrowserContentHandler.jsm
View file

@ -383,10 +383,10 @@ function nsBrowserContentHandler() {
nsBrowserContentHandler.prototype = { nsBrowserContentHandler.prototype = {
/* nsISupports */ /* nsISupports */
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsICommandLineHandler, "nsICommandLineHandler",
Ci.nsIBrowserHandler, "nsIBrowserHandler",
Ci.nsIContentHandler, "nsIContentHandler",
Ci.nsICommandLineValidator, "nsICommandLineValidator",
]), ]),
/* nsICommandLineHandler */ /* nsICommandLineHandler */

14
browser/components/BrowserGlue.jsm
View file

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

4
browser/components/doh/TRRPerformance.jsm
View file

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

4
browser/components/downloads/DownloadsCommon.jsm
View file

@ -196,8 +196,8 @@ const TELEMETRY_EVENT_CATEGORY = "downloads";
var PrefObserver = { var PrefObserver = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
getPref(name) { getPref(name) {
try { try {

2
browser/components/enterprisepolicies/Policies.jsm
View file

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

4
browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
View file

@ -87,8 +87,8 @@ function WebsiteFilter(blocklist, exceptionlist) {
WebsiteFilter.prototype = { WebsiteFilter.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
observe(subject, topic, data) { observe(subject, topic, data) {

2
browser/components/extensions/parent/ext-tabs.js
View file

@ -1457,7 +1457,7 @@ this.tabs = class extends ExtensionAPI {
} }
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
]), ]),
}; };

2
browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
View file

@ -457,7 +457,7 @@ add_task(async function browseraction_contextmenu_remove_extension() {
let { prompt } = Services; let { prompt } = Services;
let promptService = { let promptService = {
_response: 1, _response: 1,
QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]), QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
confirmEx: function(...args) { confirmEx: function(...args) {
promptService._confirmExArgs = args; promptService._confirmExArgs = args;
return promptService._response; return promptService._response;

2
browser/components/installerprefs/InstallerPrefs.jsm
View file

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

2
browser/components/migration/MigrationUtils.jsm
View file

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

2
browser/components/migration/ProfileMigrator.jsm
View file

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

4
browser/components/newtab/AboutNewTabService.jsm
View file

@ -311,8 +311,8 @@ class BaseAboutNewTabService {
this.classID = Components.ID("{cb36c925-3adc-49b3-b720-a5cc49d8a40e}"); this.classID = Components.ID("{cb36c925-3adc-49b3-b720-a5cc49d8a40e}");
this.QueryInterface = ChromeUtils.generateQI([ this.QueryInterface = ChromeUtils.generateQI([
Ci.nsIAboutNewTabService, "nsIAboutNewTabService",
Ci.nsIObserver, "nsIObserver",
]); ]);
} }

4
browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm
View file

@ -84,8 +84,8 @@ class AboutWelcomeChild extends JSWindowActorChild {
const listener = { const listener = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

2
browser/components/newtab/lib/PlacesFeed.jsm
View file

@ -41,7 +41,7 @@ class Observer {
this.dispatch = dispatch; this.dispatch = dispatch;
this.QueryInterface = ChromeUtils.generateQI([ this.QueryInterface = ChromeUtils.generateQI([
observerInterface, observerInterface,
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]); ]);
} }
} }

2
browser/components/payments/PaymentUIService.jsm
View file

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

4
browser/components/payments/content/paymentDialogWrapper.js
View file

@ -137,8 +137,8 @@ var paymentDialogWrapper = {
temporaryStore: null, temporaryStore: null,
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
/** /**

2
browser/components/places/content/controller.js
View file

@ -94,7 +94,7 @@ PlacesController.prototype = {
// actually organising the trees. // actually organising the trees.
disableUserActions: false, disableUserActions: false,
QueryInterface: ChromeUtils.generateQI([Ci.nsIClipboardOwner]), QueryInterface: ChromeUtils.generateQI(["nsIClipboardOwner"]),
// nsIClipboardOwner // nsIClipboardOwner
LosingOwnership: function PC_LosingOwnership(aXferable) { LosingOwnership: function PC_LosingOwnership(aXferable) {

2
browser/components/places/content/editBookmark.js
View file

@ -511,7 +511,7 @@ var gEditItemOverlay = {
} }
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]), QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),
_element(aID) { _element(aID) {
return document.getElementById("editBMPanel_" + aID); return document.getElementById("editBMPanel_" + aID);

6
browser/components/places/content/treeView.js
View file

@ -51,9 +51,9 @@ PlacesTreeView.prototype = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsITreeView, "nsITreeView",
Ci.nsINavHistoryResultObserver, "nsINavHistoryResultObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
/** /**

2
browser/components/places/tests/browser/browser_editBookmark_keywords.js
View file

@ -14,7 +14,7 @@ add_task(async function() {
PlacesUtils.bookmarks.removeObserver(this); PlacesUtils.bookmarks.removeObserver(this);
resolve({ property, value }); resolve({ property, value });
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]), QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),
}); });
}); });
} }

2
browser/components/places/tests/browser/browser_views_liveupdate.js
View file

@ -170,7 +170,7 @@ add_task(async function test() {
var bookmarksObserver = { var bookmarksObserver = {
_notifications: [], _notifications: [],
QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]), QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),
handlePlacesEvents(events) { handlePlacesEvents(events) {
for (let { type, parentGuid, guid, index } of events) { for (let { type, parentGuid, guid, index } of events) {

2
browser/components/preferences/dialogs/translation.js
View file

@ -71,7 +71,7 @@ Tree.prototype = {
getCellProperties(row, column) { getCellProperties(row, column) {
return ""; return "";
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsITreeView]), QueryInterface: ChromeUtils.generateQI(["nsITreeView"]),
}; };
function Lang(aCode, label) { function Lang(aCode, label) {

2
browser/components/preferences/main.js
View file

@ -1889,7 +1889,7 @@ var gMainPane = {
// nsISupports // nsISupports
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
// nsIObserver // nsIObserver

2
browser/components/preferences/tests/browser_advanced_update.js
View file

@ -16,7 +16,7 @@ const mockUpdateManager = {
_originalClassId: "", _originalClassId: "",
QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateManager]), QueryInterface: ChromeUtils.generateQI(["nsIUpdateManager"]),
createInstance(outer, iiD) { createInstance(outer, iiD) {
if (outer) { if (outer) {

2
browser/components/prompts/PromptCollection.jsm
View file

@ -81,5 +81,5 @@ PromptCollection.prototype.classID = Components.ID(
"{7913837c-9623-11ea-bb37-0242ac130002}" "{7913837c-9623-11ea-bb37-0242ac130002}"
); );
PromptCollection.prototype.QueryInterface = ChromeUtils.generateQI([ PromptCollection.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsIPromptCollection, "nsIPromptCollection",
]); ]);

2
browser/components/protocolhandler/WebProtocolHandlerRegistrar.jsm
View file

@ -175,5 +175,5 @@ WebProtocolHandlerRegistrar.prototype = {
/** /**
* See nsISupports * See nsISupports
*/ */
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProtocolHandlerRegistrar]), QueryInterface: ChromeUtils.generateQI(["nsIWebProtocolHandlerRegistrar"]),
}; };

4
browser/components/search/content/search-one-offs.js
View file

@ -126,8 +126,8 @@ class SearchOneOffs {
// Add weak referenced observers to invalidate our cached list of engines. // Add weak referenced observers to invalidate our cached list of engines.
this.QueryInterface = ChromeUtils.generateQI([ this.QueryInterface = ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]); ]);
Services.prefs.addObserver("browser.search.hiddenOneOffs", this, true); Services.prefs.addObserver("browser.search.hiddenOneOffs", this, true);
Services.obs.addObserver(this, "browser-search-engine-modified", true); Services.obs.addObserver(this, "browser-search-engine-modified", true);

2
browser/components/search/content/searchbar.js
View file

@ -60,7 +60,7 @@
searchbar.updateDisplay(); searchbar.updateDisplay();
} }
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
}; };
this._ignoreFocus = false; this._ignoreFocus = false;

8
browser/components/sessionstore/ContentRestore.jsm
View file

@ -451,8 +451,8 @@ function HistoryListener(docShell, callback) {
} }
HistoryListener.prototype = { HistoryListener.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener, "nsISHistoryListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
uninstall() { uninstall() {
@ -511,8 +511,8 @@ function ProgressListener(docShell, callbacks) {
ProgressListener.prototype = { ProgressListener.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
uninstall() { uninstall() {

6
browser/components/sessionstore/ContentSessionStore.jsm
View file

@ -258,9 +258,9 @@ class SessionHistoryListener extends Handler {
} }
} }
SessionHistoryListener.prototype.QueryInterface = ChromeUtils.generateQI([ SessionHistoryListener.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISHistoryListener, "nsISHistoryListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]); ]);
/** /**

4
browser/components/sessionstore/SessionStartup.jsm
View file

@ -421,7 +421,7 @@ var SessionStartup = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

12
browser/components/sessionstore/SessionStore.jsm
View file

@ -546,8 +546,8 @@ Object.freeze(SessionStore);
var SessionStoreInternal = { var SessionStoreInternal = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
_globalState: new GlobalState(), _globalState: new GlobalState(),
@ -1005,8 +1005,8 @@ var SessionStoreInternal = {
} }
SHistoryListener.prototype = { SHistoryListener.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener, "nsISHistoryListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
notifySHistoryChanges(index) { notifySHistoryChanges(index) {
@ -1124,8 +1124,8 @@ var SessionStoreInternal = {
} }
SHistoryListener.prototype = { SHistoryListener.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener, "nsISHistoryListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
uninstall() { uninstall() {

4
browser/components/sessionstore/test/browser_async_remove_tab.js
View file

@ -63,8 +63,8 @@ function promiseNewLocationAndHistoryEntryReplaced(tab, snippet) {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener, "nsISHistoryListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

2
browser/components/sessionstore/test/browser_not_collect_when_idle.js
View file

@ -25,7 +25,7 @@ var idleService = {
} }
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsIIdleService]), QueryInterface: ChromeUtils.generateQI(["nsIIdleService"]),
idleTime: 19999, idleTime: 19999,
addIdleObserver(observer, time) { addIdleObserver(observer, time) {

2
browser/components/sessionstore/test/browser_parentProcessRestoreHash.js
View file

@ -11,7 +11,7 @@ const TESTCLASSID = "78742c04-3630-448c-9be3-6c5070f062de";
const TESTURL = "about:testpageforsessionrestore#foo"; const TESTURL = "about:testpageforsessionrestore#foo";
let TestAboutPage = { let TestAboutPage = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]), QueryInterface: ChromeUtils.generateQI(["nsIAboutModule"]),
getURIFlags(aURI) { getURIFlags(aURI) {
// No CAN_ or MUST_LOAD_IN_CHILD means this loads in the parent: // No CAN_ or MUST_LOAD_IN_CHILD means this loads in the parent:
return ( return (

4
browser/components/sessionstore/test/head.js
View file

@ -675,8 +675,8 @@ function promiseOnHistoryReplaceEntryInChild(browser) {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener, "nsISHistoryListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

2
browser/components/ssb/SiteSpecificBrowserService.jsm
View file

@ -904,5 +904,5 @@ class SSBCommandLineHandler {
} }
SSBCommandLineHandler.prototype.QueryInterface = ChromeUtils.generateQI([ SSBCommandLineHandler.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsICommandLineHandler, "nsICommandLineHandler",
]); ]);

6
browser/components/ssb/content/ssb.js
View file

@ -91,8 +91,8 @@ class ProgressListener {
} }
ProgressListener.prototype.QueryInterface = ChromeUtils.generateQI([ ProgressListener.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]); ]);
class BrowserDOMWindow { class BrowserDOMWindow {
@ -255,7 +255,7 @@ class BrowserDOMWindow {
} }
BrowserDOMWindow.prototype.QueryInterface = ChromeUtils.generateQI([ BrowserDOMWindow.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsIBrowserDOMWindow, "nsIBrowserDOMWindow",
]); ]);
window.addEventListener("DOMContentLoaded", init, true); window.addEventListener("DOMContentLoaded", init, true);

4
browser/components/tests/browser/browser_contentpermissionprompt.js
View file

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

2
browser/components/tests/browser/browser_initial_tab_remoteType.js
View file

@ -154,7 +154,7 @@ function constructOnePageCmdLine(aURL) {
return Services.io.newURI(this._arg); return Services.io.newURI(this._arg);
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsICommandLine]), QueryInterface: ChromeUtils.generateQI(["nsICommandLine"]),
}; };
} }

2
browser/components/tests/startupRecorder.js
View file

@ -76,7 +76,7 @@ function startupRecorder() {
startupRecorder.prototype = { startupRecorder.prototype = {
classID: Components.ID("{11c095b2-e42e-4bdf-9dd0-aed87595f6a4}"), classID: Components.ID("{11c095b2-e42e-4bdf-9dd0-aed87595f6a4}"),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
record(name) { record(name) {
ChromeUtils.addProfilerMarker("startupRecorder:" + name); ChromeUtils.addProfilerMarker("startupRecorder:" + name);

4
browser/components/touchbar/MacTouchBar.js
View file

@ -499,7 +499,7 @@ const helperProto = TouchBarHelper.prototype;
helperProto.classDescription = "Services the Mac Touch Bar"; helperProto.classDescription = "Services the Mac Touch Bar";
helperProto.classID = Components.ID("{ea109912-3acc-48de-b679-c23b6a122da5}"); helperProto.classID = Components.ID("{ea109912-3acc-48de-b679-c23b6a122da5}");
helperProto.contractID = "@mozilla.org/widget/touchbarhelper;1"; 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"]); 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.classDescription = "Represents an input on the Mac Touch Bar";
inputProto.classID = Components.ID("{77441d17-f29c-49d7-982f-f20a5ab5a900}"); inputProto.classID = Components.ID("{77441d17-f29c-49d7-982f-f20a5ab5a900}");
inputProto.contractID = "@mozilla.org/widget/touchbarinput;1"; inputProto.contractID = "@mozilla.org/widget/touchbarinput;1";
inputProto.QueryInterface = ChromeUtils.generateQI([Ci.nsITouchBarInput]); inputProto.QueryInterface = ChromeUtils.generateQI(["nsITouchBarInput"]);
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
TouchBarHelper, TouchBarHelper,

2
browser/components/uitour/test/browser_UITour_defaultBrowser.js
View file

@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(
function MockShellService() {} function MockShellService() {}
MockShellService.prototype = { MockShellService.prototype = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIShellService]), QueryInterface: ChromeUtils.generateQI(["nsIShellService"]),
isDefaultBrowser(aStartupCheck, aForAllTypes) { isDefaultBrowser(aStartupCheck, aForAllTypes) {
return false; return false;
}, },

4
browser/components/urlbar/UrlbarPrefs.jsm
View file

@ -211,8 +211,8 @@ class Preferences {
constructor() { constructor() {
this._map = new Map(); this._map = new Map();
this.QueryInterface = ChromeUtils.generateQI([ this.QueryInterface = ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]); ]);
Services.prefs.addObserver(PREF_URLBAR_BRANCH, this, true); Services.prefs.addObserver(PREF_URLBAR_BRANCH, this, true);
for (let pref of PREF_OTHER_DEFAULTS.keys()) { for (let pref of PREF_OTHER_DEFAULTS.keys()) {

4
browser/components/urlbar/UrlbarSearchUtils.jsm
View file

@ -24,8 +24,8 @@ class SearchUtils {
constructor() { constructor() {
this._refreshEnginesByAliasPromise = Promise.resolve(); this._refreshEnginesByAliasPromise = Promise.resolve();
this.QueryInterface = ChromeUtils.generateQI([ this.QueryInterface = ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]); ]);
} }

2
browser/components/urlbar/tests/browser/browser_speculative_connect_not_with_client_cert.js
View file

@ -47,7 +47,7 @@ const clientAuthDialogs = {
return true; return true;
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsIClientAuthDialogs]), QueryInterface: ChromeUtils.generateQI(["nsIClientAuthDialogs"]),
}; };
function startServer(cert) { function startServer(cert) {

4
browser/extensions/formautofill/FormAutofillContent.jsm
View file

@ -145,7 +145,7 @@ AutofillProfileAutoCompleteSearch.prototype = {
classID: Components.ID("4f9f1e4c-7f2c-439e-9c9e-566b68bc187d"), classID: Components.ID("4f9f1e4c-7f2c-439e-9c9e-566b68bc187d"),
contractID: "@mozilla.org/autocomplete/search;1?name=autofill-profiles", contractID: "@mozilla.org/autocomplete/search;1?name=autofill-profiles",
classDescription: "AutofillProfileAutoCompleteSearch", classDescription: "AutofillProfileAutoCompleteSearch",
QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteSearch]), QueryInterface: ChromeUtils.generateQI(["nsIAutoCompleteSearch"]),
// Begin nsIAutoCompleteSearch implementation // Begin nsIAutoCompleteSearch implementation
@ -310,7 +310,7 @@ AutofillProfileAutoCompleteSearch.prototype = {
}; };
let ProfileAutocomplete = { let ProfileAutocomplete = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
lastProfileAutoCompleteResult: null, lastProfileAutoCompleteResult: null,
lastProfileAutoCompleteFocusedInput: null, lastProfileAutoCompleteFocusedInput: null,

2
browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
View file

@ -43,7 +43,7 @@ class ProfileAutoCompleteResult {
log.debug("Constructing new ProfileAutoCompleteResult:", [...arguments]); log.debug("Constructing new ProfileAutoCompleteResult:", [...arguments]);
// nsISupports // nsISupports
this.QueryInterface = ChromeUtils.generateQI([Ci.nsIAutoCompleteResult]); this.QueryInterface = ChromeUtils.generateQI(["nsIAutoCompleteResult"]);
// The user's query string // The user's query string
this.searchString = searchString; this.searchString = searchString;

2
browser/extensions/webcompat/about-compat/AboutCompat.jsm
View file

@ -17,7 +17,7 @@ function AboutCompat() {
); );
} }
AboutCompat.prototype = { AboutCompat.prototype = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]), QueryInterface: ChromeUtils.generateQI(["nsIAboutModule"]),
getURIFlags() { getURIFlags() {
return Ci.nsIAboutModule.URI_MUST_LOAD_IN_EXTENSION_PROCESS; return Ci.nsIAboutModule.URI_MUST_LOAD_IN_EXTENSION_PROCESS;
}, },

4
browser/fxr/content/fxrui.js
View file

@ -96,8 +96,8 @@ function setupBrowser() {
browser.addProgressListener( browser.addProgressListener(
{ {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
onLocationChange(aWebProgress, aRequest, aLocation, aFlags) { onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
// When URL changes, update the URL in the URL bar and update // When URL changes, update the URL in the URL bar and update

4
browser/modules/AboutNewTab.jsm
View file

@ -26,8 +26,8 @@ const BROWSER_READY_NOTIFICATION = "sessionstore-windows-restored";
const AboutNewTab = { const AboutNewTab = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
// AboutNewTab // AboutNewTab

8
browser/modules/BrowserUsageTelemetry.jsm
View file

@ -414,8 +414,8 @@ let URICountListener = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };
@ -463,8 +463,8 @@ let BrowserUsageTelemetry = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
uninit() { uninit() {

4
browser/modules/Sanitizer.jsm
View file

@ -341,8 +341,8 @@ var Sanitizer = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
// This method is meant to be used by tests. // This method is meant to be used by tests.

4
browser/modules/SiteDataManager.jsm
View file

@ -116,8 +116,8 @@ var SiteDataManager = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsICacheStorageConsumptionObserver, "nsICacheStorageConsumptionObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

4
browser/modules/SitePermissions.jsm
View file

@ -186,8 +186,8 @@ const GloballyBlockedPermissions = {
browser.addProgressListener( browser.addProgressListener(
{ {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
onLocationChange(aWebProgress, aRequest, aLocation, aFlags) { onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
let hasLeftPage = let hasLeftPage =

4
browser/modules/TabUnloader.jsm
View file

@ -31,8 +31,8 @@ var TabUnloader = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };

2
browser/modules/WindowsJumpLists.jsm
View file

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

8
browser/modules/WindowsPreviewPerTab.jsm
View file

@ -173,7 +173,7 @@ function PreviewController(win, tab) {
} }
PreviewController.prototype = { PreviewController.prototype = {
QueryInterface: ChromeUtils.generateQI([Ci.nsITaskbarPreviewController]), QueryInterface: ChromeUtils.generateQI(["nsITaskbarPreviewController"]),
destroy() { destroy() {
this.tab.removeEventListener("TabAttrModified", this); this.tab.removeEventListener("TabAttrModified", this);
@ -904,9 +904,9 @@ var AeroPeek = {
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
Ci.nsINavHistoryObserver, "nsINavHistoryObserver",
Ci.nsIObserver, "nsIObserver",
]), ]),
}; };

4
browser/modules/test/browser/browser_UsageTelemetry_domains.js
View file

@ -33,8 +33,8 @@ function browserLocationChanged(browser) {
} }
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsIWebProgressListener2, "nsIWebProgressListener2",
]), ]),
}; };
const filter = Cc[ const filter = Cc[

2
browser/modules/test/browser/formValidation/browser_form_validation.js
View file

@ -58,7 +58,7 @@ function checkPopupHide() {
} }
var gObserver = { var gObserver = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIFormSubmitObserver]), QueryInterface: ChromeUtils.generateQI(["nsIFormSubmitObserver"]),
notifyInvalidSubmit(aFormElement, aInvalidElements) {}, notifyInvalidSubmit(aFormElement, aInvalidElements) {},
}; };

4
browser/modules/test/browser/head.js
View file

@ -81,7 +81,7 @@ let typeInSearchField = async function(browser, text, fieldName) {
function makeMockPermissionRequest(browser) { function makeMockPermissionRequest(browser) {
let type = { let type = {
options: Cc["@mozilla.org/array;1"].createInstance(Ci.nsIArray), 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); let types = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
types.appendElement(type); types.appendElement(type);
@ -103,7 +103,7 @@ function makeMockPermissionRequest(browser) {
getDelegatePrincipal(aType) { getDelegatePrincipal(aType) {
return principal; return principal;
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionRequest]), QueryInterface: ChromeUtils.generateQI(["nsIContentPermissionRequest"]),
}; };
// In the e10s-case, nsIContentPermissionRequest will have // In the e10s-case, nsIContentPermissionRequest will have

2
chrome/test/unit/test_no_remote_registration.js
View file

@ -20,7 +20,7 @@ ProtocolHandler.prototype = {
newChannel() { newChannel() {
throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED); throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
}, },
QueryInterface: ChromeUtils.generateQI([Ci.nsIProtocolHandler]), QueryInterface: ChromeUtils.generateQI(["nsIProtocolHandler"]),
}; };
var testProtocols = [ var testProtocols = [

2
devtools/client/jsonview/Sniffer.jsm
View file

@ -63,5 +63,5 @@ class Sniffer {
} }
Sniffer.prototype.QueryInterface = ChromeUtils.generateQI([ Sniffer.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsIContentSniffer, "nsIContentSniffer",
]); ]);

6
devtools/client/jsonview/converter-child.js
View file

@ -49,9 +49,9 @@ function Converter() {}
Converter.prototype = { Converter.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIStreamConverter, "nsIStreamConverter",
Ci.nsIStreamListener, "nsIStreamListener",
Ci.nsIRequestObserver, "nsIRequestObserver",
]), ]),
get wrappedJSObject() { get wrappedJSObject() {

16
devtools/client/jsonview/test/browser_jsonview_data_blocking.js
View file

@ -72,14 +72,14 @@ add_task(async function test_converter_abort_should_stop_data_sending() {
// Stub all the things. // Stub all the things.
const chan = { const chan = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIChannel, "nsIChannel",
Ci.nsIWritablePropertyBag, "nsIWritablePropertyBag",
]), ]),
URI: Services.io.newURI("data:application/json,{}"), URI: Services.io.newURI("data:application/json,{}"),
// loadinfo is builtinclass, need to actually have one: // loadinfo is builtinclass, need to actually have one:
loadInfo, loadInfo,
notificationCallbacks: { notificationCallbacks: {
QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor]), QueryInterface: ChromeUtils.generateQI(["nsIInterfaceRequestor"]),
getInterface() { getInterface() {
// We want a loadcontext here, which is also builtinclass, can't stub. // We want a loadcontext here, which is also builtinclass, can't stub.
return docShell; return docShell;
@ -90,7 +90,7 @@ add_task(async function test_converter_abort_should_stop_data_sending() {
}; };
let onStartFired = false; let onStartFired = false;
const listener = { const listener = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamListener]), QueryInterface: ChromeUtils.generateQI(["nsIStreamListener"]),
onStartRequest() { onStartRequest() {
onStartFired = true; onStartFired = true;
// This should force the converter to abort, too: // 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. // Stub all the things.
const chan = { const chan = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIChannel, "nsIChannel",
Ci.nsIWritablePropertyBag, "nsIWritablePropertyBag",
]), ]),
URI: Services.io.newURI("data:application/json,{}"), URI: Services.io.newURI("data:application/json,{}"),
// loadinfo is builtinclass, need to actually have one: // loadinfo is builtinclass, need to actually have one:
loadInfo, loadInfo,
notificationCallbacks: { notificationCallbacks: {
QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor]), QueryInterface: ChromeUtils.generateQI(["nsIInterfaceRequestor"]),
getInterface() { getInterface() {
// We want a loadcontext here, which is also builtinclass, can't stub. // We want a loadcontext here, which is also builtinclass, can't stub.
return docShell; return docShell;
@ -151,7 +151,7 @@ add_task(async function test_converter_principal_needs_matching() {
}; };
let onStartFired = false; let onStartFired = false;
const listener = { const listener = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamListener]), QueryInterface: ChromeUtils.generateQI(["nsIStreamListener"]),
onStartRequest() { onStartRequest() {
onStartFired = true; onStartFired = true;
}, },

2
devtools/client/shared/test/shared-head.js
View file

@ -232,7 +232,7 @@ registerCleanupFunction(function() {
* Watch console messages for failed propType definitions in React components. * Watch console messages for failed propType definitions in React components.
*/ */
const ConsoleObserver = { const ConsoleObserver = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
observe: function(subject) { observe: function(subject) {
const message = subject.wrappedJSObject.arguments[0]; const message = subject.wrappedJSObject.arguments[0];

2
devtools/client/webconsole/test/browser/browser_webconsole_network_requests_from_chrome.js
View file

@ -12,7 +12,7 @@ add_task(async function() {
// Start a listener on the console service. // Start a listener on the console service.
let good = true; let good = true;
const listener = { const listener = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
observe: function(subject) { observe: function(subject) {
if ( if (
subject instanceof Ci.nsIScriptError && subject instanceof Ci.nsIScriptError &&

2
devtools/client/webconsole/test/browser/browser_webconsole_observer_notifications.js
View file

@ -23,7 +23,7 @@ add_task(async function() {
function setupObserver() { function setupObserver() {
const observer = { const observer = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
observe: function observe(subject, topic) { observe: function observe(subject, topic) {
subject = subject.QueryInterface(Ci.nsISupportsString); subject = subject.QueryInterface(Ci.nsISupportsString);

4
devtools/server/actors/addon/webextension-inspected-window.js
View file

@ -125,8 +125,8 @@ function CustomizedReload(params) {
CustomizedReload.prototype = { CustomizedReload.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
get window() { get window() {
return this.docShell.DOMWindow; return this.docShell.DOMWindow;

4
devtools/server/actors/highlighters.js
View file

@ -376,8 +376,8 @@ HighlighterEnvironment.prototype = {
const self = this; const self = this;
this.listener = { this.listener = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
onStateChange: function(progress, request, flag) { onStateChange: function(progress, request, flag) {

2
devtools/server/actors/network-monitor/channel-event-sink.js
View file

@ -24,7 +24,7 @@ function ChannelEventSink() {
} }
ChannelEventSink.prototype = { ChannelEventSink.prototype = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIChannelEventSink]), QueryInterface: ChromeUtils.generateQI(["nsIChannelEventSink"]),
registerCollector(collector) { registerCollector(collector) {
this.collectors.add(collector); this.collectors.add(collector);

8
devtools/server/actors/network-monitor/network-response-listener.js
View file

@ -69,10 +69,10 @@ exports.NetworkResponseListener = NetworkResponseListener;
NetworkResponseListener.prototype = { NetworkResponseListener.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIStreamListener, "nsIStreamListener",
Ci.nsIInputStreamCallback, "nsIInputStreamCallback",
Ci.nsIRequestObserver, "nsIRequestObserver",
Ci.nsIInterfaceRequestor, "nsIInterfaceRequestor",
]), ]),
// nsIInterfaceRequestor implementation // nsIInterfaceRequestor implementation

5
devtools/server/actors/reflow.js
View file

@ -24,7 +24,6 @@
* These dedicated classes are used by the LayoutChangesObserver. * These dedicated classes are used by the LayoutChangesObserver.
*/ */
const { Ci } = require("chrome");
const ChromeUtils = require("ChromeUtils"); const ChromeUtils = require("ChromeUtils");
const protocol = require("devtools/shared/protocol"); const protocol = require("devtools/shared/protocol");
const EventEmitter = require("devtools/shared/event-emitter"); const EventEmitter = require("devtools/shared/event-emitter");
@ -460,8 +459,8 @@ class ReflowObserver extends Observable {
} }
ReflowObserver.prototype.QueryInterface = ChromeUtils.generateQI([ ReflowObserver.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsIReflowObserver, "nsIReflowObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]); ]);
/** /**

2
devtools/server/actors/resources/platform-messages.js
View file

@ -35,7 +35,7 @@ class PlatformMessageWatcher {
// Create the consoleListener. // Create the consoleListener.
const listener = { const listener = {
QueryInterface: ChromeUtils.generateQI([Ci.nsIConsoleListener]), QueryInterface: ChromeUtils.generateQI(["nsIConsoleListener"]),
observe(message) { observe(message) {
if (!shouldHandleMessage(message)) { if (!shouldHandleMessage(message)) {
return; return;

4
devtools/server/actors/targets/browsing-context.js
View file

@ -1662,8 +1662,8 @@ function DebuggerProgressListener(targetActor) {
DebuggerProgressListener.prototype = { DebuggerProgressListener.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
destroy() { destroy() {

4
devtools/server/actors/webconsole/content-process-forward.js
View file

@ -43,8 +43,8 @@ function ContentProcessForward() {
} }
ContentProcessForward.prototype = { ContentProcessForward.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
receiveMessage(message) { receiveMessage(message) {

4
devtools/server/actors/webconsole/listeners/console-file-activity.js
View file

@ -34,8 +34,8 @@ ConsoleFileActivityListener.prototype = {
_webProgress: null, _webProgress: null,
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, "nsIWebProgressListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
/** /**

6
devtools/server/actors/webconsole/listeners/console-reflow.js
View file

@ -4,7 +4,7 @@
"use strict"; "use strict";
const { Ci, components } = require("chrome"); const { components } = require("chrome");
const ChromeUtils = require("ChromeUtils"); const ChromeUtils = require("ChromeUtils");
/** /**
@ -29,8 +29,8 @@ exports.ConsoleReflowListener = ConsoleReflowListener;
ConsoleReflowListener.prototype = { ConsoleReflowListener.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIReflowObserver, "nsIReflowObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
docshell: null, docshell: null,
listener: null, listener: null,

3
devtools/server/actors/worker/service-worker-registration.js
View file

@ -4,7 +4,6 @@
"use strict"; "use strict";
const { Ci } = require("chrome");
const ChromeUtils = require("ChromeUtils"); const ChromeUtils = require("ChromeUtils");
const Services = require("Services"); const Services = require("Services");
const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm"); 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); console.error("Failed to unregister the service worker for " + scope);
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIServiceWorkerUnregisterCallback, "nsIServiceWorkerUnregisterCallback",
]), ]),
}; };
swm.propagateUnregister(principal, unregisterCallback, scope); swm.propagateUnregister(principal, unregisterCallback, scope);

4
devtools/shared/webconsole/throttle.js
View file

@ -48,8 +48,8 @@ function NetworkThrottleListener(queue) {
NetworkThrottleListener.prototype = { NetworkThrottleListener.prototype = {
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIStreamListener, "nsIStreamListener",
Ci.nsIInterfaceRequestor, "nsIInterfaceRequestor",
]), ]),
/** /**

2
devtools/startup/DevToolsStartup.jsm
View file

@ -1251,7 +1251,7 @@ DevToolsStartup.prototype = {
/* eslint-disable max-len */ /* eslint-disable max-len */
classID: Components.ID("{9e9a9283-0ce9-4e4a-8f1c-ba129a032c32}"), classID: Components.ID("{9e9a9283-0ce9-4e4a-8f1c-ba129a032c32}"),
QueryInterface: ChromeUtils.generateQI([Ci.nsICommandLineHandler]), QueryInterface: ChromeUtils.generateQI(["nsICommandLineHandler"]),
}; };
/** /**

12
docshell/base/URIFixup.jsm
View file

@ -181,8 +181,8 @@ XPCOMUtils.defineLazyGetter(this, "knownDomains", () => {
} }
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };
Services.prefs.addObserver(branch, domains._observer, true); Services.prefs.addObserver(branch, domains._observer, true);
@ -239,8 +239,8 @@ XPCOMUtils.defineLazyGetter(this, "knownSuffixes", () => {
} }
}, },
QueryInterface: ChromeUtils.generateQI([ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, "nsIObserver",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]), ]),
}; };
Services.prefs.addObserver(branch, suffixes._observer, true); Services.prefs.addObserver(branch, suffixes._observer, true);
@ -556,7 +556,7 @@ URIFixup.prototype = {
classID: Components.ID("{c6cf88b7-452e-47eb-bdc9-86e3561648ef}"), classID: Components.ID("{c6cf88b7-452e-47eb-bdc9-86e3561648ef}"),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(URIFixup), _xpcom_factory: XPCOMUtils.generateSingletonFactory(URIFixup),
QueryInterface: ChromeUtils.generateQI([Ci.nsIURIFixup]), QueryInterface: ChromeUtils.generateQI(["nsIURIFixup"]),
}; };
function URIFixupInfo(originalInput = "") { function URIFixupInfo(originalInput = "") {
@ -621,7 +621,7 @@ URIFixupInfo.prototype = {
}, },
classID: Components.ID("{33d75835-722f-42c0-89cc-44f328e56a86}"), classID: Components.ID("{33d75835-722f-42c0-89cc-44f328e56a86}"),
QueryInterface: ChromeUtils.generateQI([Ci.nsIURIFixupInfo]), QueryInterface: ChromeUtils.generateQI(["nsIURIFixupInfo"]),
}; };
// Helpers // Helpers

4
docshell/test/browser/Bug422543Child.jsm
View file

@ -26,8 +26,8 @@ class SHistoryListener {
OnHistoryReplaceEntry() {} OnHistoryReplaceEntry() {}
} }
SHistoryListener.prototype.QueryInterface = ChromeUtils.generateQI([ SHistoryListener.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsISHistoryListener, "nsISHistoryListener",
Ci.nsISupportsWeakReference, "nsISupportsWeakReference",
]); ]);
let listeners; let listeners;

Some files were not shown because too many files have changed in this diff Show more