Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1456035: Part 4 - Convert callers of XPCOMUtils.generateQI to ChromeUtils.generateQI. r=mccr8

Browse Source 
This also removes any redundant Ci.nsISupports elements in the interface
lists.

This was done using the following script:

acecb401b7/processors/chromeutils-generateQI.jsm

MozReview-Commit-ID: AIx10P8GpZY

--HG--
extra : rebase_source : a29c07530586dc18ba040f19215475ac20fcfb3b
This commit is contained in:
Kris Maglione 2018-04-22 20:55:06 -07:00
parent 1b96577a60
commit a259026c9d
460 changed files with 944 additions and 1002 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/jsat/ContentControl.jsm
View File

@ -502,7 +502,7 @@ this.ContentControl.prototype = {
this._autoMove = 0;
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference,
Ci.nsIMessageListener
])
};

5
accessible/jsat/EventManager.jsm
View File

@ -556,10 +556,7 @@ this.EventManager.prototype = {
this.present(Presentation.tabStateChanged(docAcc, "newdoc"));
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
Ci.nsISupports,
Ci.nsIObserver])
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference, Ci.nsIObserver])
};
const AccessibilityEventObserver = {

2
accessible/jsat/Traversal.jsm
View File

@ -67,7 +67,7 @@ BaseTraversalRule.prototype = {
return matchResult;
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAccessibleTraversalRule])
QueryInterface: ChromeUtils.generateQI([Ci.nsIAccessibleTraversalRule])
};
var gSimpleTraversalRoles =

4
accessible/jsat/Utils.jsm
View File

@ -1057,6 +1057,6 @@ PrefCache.prototype = {
}
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference])
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference])
};

4
accessible/tests/mochitest/pivot.js
View File

@ -34,7 +34,7 @@ var HeadersTraversalRule =
return FILTER_MATCH;
},
QueryInterface: XPCOMUtils.generateQI([nsIAccessibleTraversalRule])
QueryInterface: ChromeUtils.generateQI([nsIAccessibleTraversalRule])
};
/**
@ -62,7 +62,7 @@ var ObjectTraversalRule =
return rv;
},
QueryInterface: XPCOMUtils.generateQI([nsIAccessibleTraversalRule])
QueryInterface: ChromeUtils.generateQI([nsIAccessibleTraversalRule])
};
// //////////////////////////////////////////////////////////////////////////////

2
browser/base/content/browser-data-submission-info-bar.js
View File

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

4
browser/base/content/browser-feeds.js
View File

@ -412,8 +412,8 @@ var FeedHandler = {
// nsISupports
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
init() {

5
browser/base/content/browser-fullZoom.js
View File

@ -39,10 +39,7 @@ var FullZoom = {
// nsISupports
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsIContentPrefObserver,
Ci.nsISupportsWeakReference,
Ci.nsISupports]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsIContentPrefObserver, Ci.nsISupportsWeakReference]),
// Initialization & Destruction

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

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

2
browser/base/content/browser-sync.js
View File

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

6
browser/base/content/browser.js
View File

@ -5384,7 +5384,7 @@ var TabsProgressListener = {
function nsBrowserAccess() { }
nsBrowserAccess.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIBrowserDOMWindow, Ci.nsISupports]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIBrowserDOMWindow]),
_openURIInNewTab(aURI, aReferrer, aReferrerPolicy, aIsPrivate,
aIsExternal, aForceNotRemote = false,
@ -7740,8 +7740,8 @@ var RestoreLastSessionObserver = {
goSetCommandEnabled("Browser:RestoreLastSession", false);
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference])
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference])
};
function restoreLastSession() {

4
browser/base/content/content.js
View File

@ -1524,8 +1524,8 @@ let OfflineApps = {
}
}
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
};
addEventListener("MozApplicationManifest", OfflineApps, false);

5
browser/base/content/tab-content.js
View File

@ -859,10 +859,7 @@ var RefreshBlocker = {
}
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener2,
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
Ci.nsISupports]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener2, Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference]),
};
RefreshBlocker.init();

2
browser/base/content/test/about/head.js
View File

@ -119,7 +119,7 @@ function waitForDocLoadAndStopIt(aExpectedURL, aBrowser = gBrowser.selectedBrows
stopContent(contentStopFromProgressListener, chan.originalURI.spec);
}
},
QueryInterface: XPCOMUtils.generateQI(["nsISupportsWeakReference"])
QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference"])
};
wp.addProgressListener(progressListener, wp.NOTIFY_STATE_WINDOW);

4
browser/base/content/test/chrome/test_aboutCrashed.xul
View File

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

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

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

4
browser/base/content/test/general/browser_e10s_about_process.js
View File

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

3
browser/base/content/test/general/browser_fullscreen-window-open.js
View File

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

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

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

2
browser/base/content/test/general/head.js
View File

@ -547,7 +547,7 @@ function promiseOnBookmarkItemAdded(aExpectedURI) {
onItemChanged() {},
onItemVisited() {},
onItemMoved() {},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver,
])
};

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

@ -54,8 +54,8 @@ async function recordReflows(testPromise, win = window) {
// driver ticking. These are fine.
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIReflowObserver,
Ci.nsISupportsWeakReference])
QueryInterface: ChromeUtils.generateQI([Ci.nsIReflowObserver,
Ci.nsISupportsWeakReference])
};
let docShell = win.QueryInterface(Ci.nsIInterfaceRequestor)

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

@ -15,9 +15,9 @@ SimpleTest.requestFlakyTimeout("Need to simulate blocklist calls actually taking
var BlocklistProxy = {
_uuid: null,
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsIBlocklistService,
Ci.nsITimerCallback]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsIBlocklistService,
Ci.nsITimerCallback]),
init() {
if (!this._uuid) {

2
browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js
View File

@ -204,7 +204,7 @@ function checkAutocompleteResults(aExpected, aCallback) {
setSelectedIndex() {},
get searchCount() { return this.searches.length; },
getSearchAt(aIndex) { return this.searches[aIndex]; },
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIAutoCompleteInput,
Ci.nsIAutoCompletePopup,
])

2
browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js
View File

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

2
browser/base/content/test/urlbar/head.js
View File

@ -62,7 +62,7 @@ function waitForDocLoadAndStopIt(aExpectedURL, aBrowser = gBrowser.selectedBrows
stopContent(contentStopFromProgressListener, chan.originalURI.spec);
}
},
QueryInterface: XPCOMUtils.generateQI(["nsISupportsWeakReference"])
QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference"])
};
wp.addProgressListener(progressListener, wp.NOTIFY_STATE_WINDOW);

3
browser/components/about/nsAboutCapabilities.js
View File

@ -67,8 +67,7 @@ nsAboutCapabilities.prototype = {
contractID: "@mozilla.org/aboutcapabilities;1",
classID: Components.ID("{4c2b1f46-e637-4a91-8108-8a9fb7aab91d}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
Ci.nsIDOMGlobalPropertyInitializer])
QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsAboutCapabilities]);

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

@ -75,8 +75,8 @@ const kMaxHistoryResultsForLimitedView = 42;
const kPrefBranch = Services.prefs.getBranch("browser.download.");
var PrefObserver = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
getPref(name) {
try {
switch (typeof this.prefs[name]) {

6
browser/components/enterprisepolicies/EnterprisePolicies.js
View File

@ -69,9 +69,9 @@ function EnterprisePoliciesManager() {
EnterprisePoliciesManager.prototype = {
// for XPCOM
classID: Components.ID("{ea4e1414-779b-458b-9d1f-d18e8efbc145}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference,
Ci.nsIEnterprisePolicies]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference,
Ci.nsIEnterprisePolicies]),
// redefine the default factory for XPCOMUtils
_xpcom_factory: EnterprisePoliciesFactory,

2
browser/components/enterprisepolicies/EnterprisePoliciesContent.js
View File

@ -51,7 +51,7 @@ function EnterprisePoliciesManagerContent() {
EnterprisePoliciesManagerContent.prototype = {
// for XPCOM
classID: Components.ID("{dc6358f8-d167-4566-bf5b-4350b5e6a7a2}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIEnterprisePolicies]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIEnterprisePolicies]),
// redefine the default factory for XPCOMUtils
_xpcom_factory: EnterprisePoliciesFactory,

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

@ -79,8 +79,8 @@ function WebsiteFilter(blocklist, exceptionlist) {
}
WebsiteFilter.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
let channel, isDocument = false;

4
browser/components/enterprisepolicies/tests/browser/browser_policy_search_engine.js
View File

@ -160,11 +160,11 @@ add_task(async function test_AddSearchProvider() {
alert() {
this.promptCount++;
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt]),
};
let windowWatcher = {
getNewPrompter: () => mockPrompter,
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowWatcher]),
};
let origWindowWatcher = Services.ww;
Services.ww = windowWatcher;

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

@ -1169,7 +1169,7 @@ this.tabs = class extends ExtensionAPI {
resolve(retval == 0 ? "not_saved" : "not_replaced");
}
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener]),
};
activeTab.linkedBrowser.print(activeTab.linkedBrowser.outerWindowID, printSettings, printProgressListener);

4
browser/components/feeds/FeedWriter.js
View File

@ -981,8 +981,8 @@ FeedWriter.prototype = {
},
classID: FEEDWRITER_CID,
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsIDOMGlobalPropertyInitializer])
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsIDOMGlobalPropertyInitializer])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FeedWriter]);

4
browser/components/feeds/WebContentConverter.js
View File

@ -865,7 +865,7 @@ WebContentConverterRegistrar.prototype = {
/**
* See nsISupports
*/
QueryInterface: XPCOMUtils.generateQI(
QueryInterface: ChromeUtils.generateQI(
[Ci.nsIWebContentConverterService,
Ci.nsIWebContentHandlerRegistrar,
Ci.nsIObserver,
@ -1044,7 +1044,7 @@ WebContentConverterRegistrarContent.prototype = {
/**
* See nsISupports
*/
QueryInterface: XPCOMUtils.generateQI(
QueryInterface: ChromeUtils.generateQI(
[Ci.nsIWebContentHandlerRegistrar,
Ci.nsIWebContentConverterService,
Ci.nsIFactory])

2
browser/components/migration/AutoMigrate.jsm
View File

@ -679,7 +679,7 @@ const AutoMigrate = {
chromeWindow.openTrustedLinkIn(url, "tab");
},
QueryInterface: XPCOMUtils.generateQI(
QueryInterface: ChromeUtils.generateQI(
[Ci.nsIObserver, Ci.nsINavBookmarkObserver, Ci.nsISupportsWeakReference]
),

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

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

2
browser/components/migration/ProfileMigrator.js
View File

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

2
browser/components/newtab/aboutNewTabService.js
View File

@ -92,7 +92,7 @@ AboutNewTabService.prototype = {
willNotifyUser: false,
classID: Components.ID("{dfcd2adc-7867-4d3a-ba70-17501f208142}"),
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIAboutNewTabService,
Ci.nsIObserver
]),

8
browser/components/nsBrowserContentHandler.js
View File

@ -286,10 +286,10 @@ nsBrowserContentHandler.prototype = {
},
/* nsISupports */
QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler,
Ci.nsIBrowserHandler,
Ci.nsIContentHandler,
Ci.nsICommandLineValidator]),
QueryInterface: ChromeUtils.generateQI([Ci.nsICommandLineHandler,
Ci.nsIBrowserHandler,
Ci.nsIContentHandler,
Ci.nsICommandLineValidator]),
/* nsICommandLineHandler */
handle: function bch_handle(cmdLine) {

8
browser/components/nsBrowserGlue.js
View File

@ -2729,8 +2729,8 @@ BrowserGlue.prototype = {
// for XPCOM
classID: Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(BrowserGlue),
};
@ -2789,7 +2789,7 @@ function ContentPermissionPrompt() {}
ContentPermissionPrompt.prototype = {
classID: Components.ID("{d8903bf6-68d5-4e97-bcd1-e4d3012f721a}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionPrompt]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionPrompt]),
/**
* This implementation of nsIContentPermissionPrompt.prompt ensures
@ -3042,7 +3042,7 @@ var JawsScreenReaderVersionCheck = {
Services.obs.addObserver(this, "a11y-init-or-shutdown", true);
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
if (topic == "a11y-init-or-shutdown" && data == "1") {

2
browser/components/payments/content/paymentDialogWrapper.js
View File

@ -40,7 +40,7 @@ var paymentDialogWrapper = {
mm: null,
request: null,
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
]),

2
browser/components/payments/paymentUIService.js
View File

@ -37,7 +37,7 @@ function PaymentUIService() {
PaymentUIService.prototype = {
classID: Components.ID("{01f8bd55-9017-438b-85ec-7c15d2b35cdc}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIService]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
DIALOG_URL: "chrome://payments/content/paymentDialogWrapper.xhtml",
REQUEST_ID_PREFIX: "paymentRequest-",

2
browser/components/places/content/browserPlacesViews.js
View File

@ -41,7 +41,7 @@ PlacesViewBase.prototype = {
// the native mac menu).
_nativeView: false,
QueryInterface: XPCOMUtils.generateQI(
QueryInterface: ChromeUtils.generateQI(
[Ci.nsINavHistoryResultObserver,
Ci.nsISupportsWeakReference]),

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

@ -88,7 +88,7 @@ PlacesController.prototype = {
// actually organising the trees.
disableUserActions: false,
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIClipboardOwner
]),

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

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

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

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

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

@ -127,7 +127,7 @@ add_task(async function test() {
* nodes positions in the affected views.
*/
var bookmarksObserver = {
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver,
Ci.nsIAnnotationObserver
]),

2
browser/components/places/tests/unit/head_bookmarks.js
View File

@ -76,7 +76,7 @@ function rebuildSmartBookmarks() {
}
do_throw("Got console message: " + aMsg.message);
},
QueryInterface: XPCOMUtils.generateQI([ Ci.nsIConsoleListener ]),
QueryInterface: ChromeUtils.generateQI([ Ci.nsIConsoleListener ]),
};
Services.console.reset();
Services.console.registerListener(consoleListener);

2
browser/components/preferences/in-content/main.js
View File

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

2
browser/components/preferences/in-content/tests/browser_advanced_update.js
View File

@ -18,7 +18,7 @@ const mockUpdateManager = {
_originalFactory: null,
QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdateManager]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateManager]),
createInstance(outer, iiD) {
if (outer) {

2
browser/components/preferences/translation.js
View File

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

2
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
View File

@ -88,7 +88,7 @@ add_task(async function test_toggleTrackingProtection() {
Services.prefs.getBranch("privacy.trackingprotection.pbmode.");
let waitForPrefChanged = () => new Promise(resolve => {
let prefObserver = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
observe() {
prefBranch.removeObserver("enabled", prefObserver);
resolve();

4
browser/components/search/test/head.js
View File

@ -93,8 +93,8 @@ let promiseStateChangeFrameScript = "data:," + encodeURIComponent(`(${
const global = this;
const LISTENER = Symbol("listener");
let listener = {
QueryInterface: XPCOMUtils.generateQI(["nsISupportsWeakReference",
"nsIWebProgressListener"]),
QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference",
"nsIWebProgressListener"]),
onStateChange: function onStateChange(webProgress, req, flags, status) {
// Only care about top-level document starts

4
browser/components/sessionstore/ContentRestore.jsm
View File

@ -371,7 +371,7 @@ function HistoryListener(docShell, callback) {
this.callback = callback;
}
HistoryListener.prototype = {
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
]),
@ -451,7 +451,7 @@ function ProgressListener(docShell, callbacks) {
}
ProgressListener.prototype = {
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference
]),

2
browser/components/sessionstore/SessionStore.jsm
View File

@ -438,7 +438,7 @@ var SessionStore = {
Object.freeze(SessionStore);
var SessionStoreInternal = {
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference
]),

10
browser/components/sessionstore/content/content-sessionStore.js
View File

@ -142,8 +142,8 @@ var StateChangeNotifier = {
}
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference])
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference])
};
/**
@ -447,7 +447,7 @@ var SessionHistoryListener = {
// Ignore, the method is implemented so that XPConnect doesn't throw!
},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
])
@ -699,8 +699,8 @@ var PrivacyListener = {
MessageQueue.push("isPrivate", () => enabled || null);
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrivacyTransitionObserver,
Ci.nsISupportsWeakReference])
QueryInterface: ChromeUtils.generateQI([Ci.nsIPrivacyTransitionObserver,
Ci.nsISupportsWeakReference])
};
/**

6
browser/components/sessionstore/nsSessionStartup.js
View File

@ -356,9 +356,9 @@ SessionStartup.prototype = {
},
/* ........ QueryInterface .............. */
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference,
Ci.nsISessionStartup]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference,
Ci.nsISessionStartup]),
classID: Components.ID("{ec7a6c20-e081-11da-8ad9-0800200c9a66}")
};

2
browser/components/sessionstore/test/browser_599909.js
View File

@ -111,7 +111,7 @@ function checkAutocompleteResults(aExpected, aCallback) {
getSearchAt(aIndex) {
return this.searches[aIndex];
},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIAutoCompleteInput,
Ci.nsIAutoCompletePopup,
])

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

@ -48,7 +48,7 @@ function promiseNewLocationAndHistoryEntryReplaced(browser, snippet) {
resolve();
},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
])
@ -78,7 +78,7 @@ function promiseHistoryEntryReplacedNonRemote(browser) {
executeSoon(resolve);
},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
])

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

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

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

@ -12,7 +12,7 @@ const TESTURL = "about:testpageforsessionrestore#foo";
let TestAboutPage = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
getURIFlags(aURI) {
// No CAN_ or MUST_LOAD_IN_CHILD means this loads in the parent:
return Ci.nsIAboutModule.ALLOW_SCRIPT |

2
browser/components/sessionstore/test/content.js
View File

@ -46,7 +46,7 @@ var historyListener = {
sendAsyncMessage("ss-test:OnHistoryReplaceEntry");
},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
])

4
browser/components/shell/HeadlessShell.jsm
View File

@ -39,8 +39,8 @@ function loadContentWindow(webNavigation, uri) {
resolve(contentWindow);
}, { once: true });
},
QueryInterface: XPCOMUtils.generateQI(["nsIWebProgressListener",
"nsISupportsWeakReference"])
QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
"nsISupportsWeakReference"])
};
progressListeners.set(progressListener, progressListener);
webProgress.addProgressListener(progressListener,

6
browser/components/tests/browser/browser_contentpermissionprompt.js
View File

@ -26,7 +26,7 @@ function MockContentPermissionType(type) {
}
MockContentPermissionType.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionType]),
// We expose the wrappedJSObject so that we can be sure
// in some of our tests that we're passing the right
// nsIContentPermissionType around.
@ -49,7 +49,7 @@ function MockContentPermissionRequest(typesArray) {
}
MockContentPermissionRequest.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionRequest]),
// We expose the wrappedJSObject so that we can be sure
// in some of our tests that we're passing the right
// nsIContentPermissionRequest around.
@ -100,7 +100,7 @@ add_task(async function test_multiple_types() {
*/
add_task(async function test_not_permission_type() {
let mockRequest = new MockContentPermissionRequest([
{ QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports]) },
{ QueryInterface: ChromeUtils.generateQI([]) },
]);
Assert.throws(() => { ContentPermissionPrompt.prompt(mockRequest); },

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

@ -57,7 +57,7 @@ function startupRecorder() {
startupRecorder.prototype = {
classID: Components.ID("{11c095b2-e42e-4bdf-9dd0-aed87595f6a4}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
record(name) {
if (!Services.prefs.getBoolPref("browser.startup.record", false))

4
browser/components/translation/TranslationContentHandler.jsm
View File

@ -105,8 +105,8 @@ TranslationContentHandler.prototype = {
});
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference]),
receiveMessage(msg) {
switch (msg.name) {

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

@ -10,7 +10,7 @@ Services.scriptloader
function MockShellService() {}
MockShellService.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIShellService]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIShellService]),
isDefaultBrowser(aStartupCheck, aForAllTypes) { return false; },
setDefaultBrowser(aClaimAllTypes, aForAllUsers) {
setDefaultBrowserCalled = true;

2
browser/extensions/activity-stream/lib/PlacesFeed.jsm
View File

@ -22,7 +22,7 @@ const PLACES_LINKS_CHANGED_DELAY_TIME = 1000; // time in ms to delay timer for p
class Observer {
constructor(dispatch, observerInterface) {
this.dispatch = dispatch;
this.QueryInterface = XPCOMUtils.generateQI([observerInterface, Ci.nsISupportsWeakReference]);
this.QueryInterface = ChromeUtils.generateQI([observerInterface, Ci.nsISupportsWeakReference]);
}
}

2
browser/extensions/followonsearch/content/followonsearch-fs.js
View File

@ -141,7 +141,7 @@ let searchingGoogle = false;
* a progress listener.
*/
var webProgressListener = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference]),
onLocationChange(aWebProgress, aRequest, aLocation, aFlags)
{
if (aWebProgress.DOMWindow && (aWebProgress.DOMWindow != content)) {

6
browser/extensions/formautofill/FormAutofillContent.jsm
View File

@ -81,7 +81,7 @@ AutofillProfileAutoCompleteSearch.prototype = {
classID: Components.ID("4f9f1e4c-7f2c-439e-9c9e-566b68bc187d"),
contractID: "@mozilla.org/autocomplete/search;1?name=autofill-profiles",
classDescription: "AutofillProfileAutoCompleteSearch",
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteSearch]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteSearch]),
// Begin nsIAutoCompleteSearch implementation
@ -209,7 +209,7 @@ AutofillProfileAutoCompleteSearch.prototype = {
};
let ProfileAutocomplete = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
lastProfileAutoCompleteResult: null,
lastProfileAutoCompleteFocusedInput: null,
@ -324,7 +324,7 @@ let ProfileAutocomplete = {
* NOTE: Declares it by "var" to make it accessible in unit tests.
*/
var FormAutofillContent = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIFormSubmitObserver]),
/**
* @type {WeakMap} mapping FormLike root HTML elements to FormAutofillHandler objects.
*/

2
browser/extensions/formautofill/FormAutofillParent.jsm
View File

@ -69,7 +69,7 @@ function FormAutofillParent() {
}
FormAutofillParent.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
/**
* Cache of the Form Autofill status (considering preferences and storage).

2
browser/extensions/formautofill/MasterPassword.jsm
View File

@ -177,7 +177,7 @@ var MasterPassword = {
return new Promise((resolve) => {
log.debug("waitForExistingDialog: Observing the open dialog");
let observer = {
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
]),

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

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

4
browser/extensions/formautofill/test/unit/test_masterPassword.js
View File

@ -46,14 +46,14 @@ let gMockPrompter = {
return true;
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt]),
};
// Mock nsIWindowWatcher. PSM calls getNewPrompter on this to get an nsIPrompt
// to call promptPassword. We return the mock one, above.
let gWindowWatcher = {
getNewPrompter: () => gMockPrompter,
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowWatcher]),
};
// Ensure that the appropriate initialization has happened.

2
browser/extensions/pdfjs/content/PdfJs.jsm
View File

@ -127,7 +127,7 @@ Factory.prototype = {
};
var PdfJs = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
_registered: false,
_initialized: false,

7
browser/extensions/pdfjs/content/PdfStreamConverter.jsm
View File

@ -809,12 +809,7 @@ PdfStreamConverter.prototype = {
classID2: Components.ID("{d0c5195d-e798-49d4-b1d3-9324328b2292}"),
contractID2: "@mozilla.org/streamconv;1?from=application/pdf&to=text/html",
QueryInterface: XPCOMUtils.generateQI([
Ci.nsISupports,
Ci.nsIStreamConverter,
Ci.nsIStreamListener,
Ci.nsIRequestObserver
]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamConverter, Ci.nsIStreamListener, Ci.nsIRequestObserver]),
/*
* This component works as such:

2
browser/extensions/pocket/content/AboutPocket.jsm
View File

@ -31,7 +31,7 @@ function AboutPage(chromeURL, aboutHost, classID, description, uriFlags) {
}
AboutPage.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
getURIFlags(aURI) { // eslint-disable-line no-unused-vars
return this.uriFlags;
},

2
browser/extensions/webcompat-reporter/content/WebCompatReporter.jsm
View File

@ -108,7 +108,7 @@ let WebCompatReporter = {
if (tabData && tabData.blob) {
let browser = gBrowser.getBrowserForTab(tab);
let loadedListener = {
QueryInterface: XPCOMUtils.generateQI(["nsIWebProgressListener",
QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
"nsISupportsWeakReference"]),
onStateChange(webProgress, request, flags, status) {
let isStopped = flags & Ci.nsIWebProgressListener.STATE_STOP;

12
browser/modules/BrowserUsageTelemetry.jsm
View File

@ -227,8 +227,8 @@ let URICountListener = {
this._domainSet.clear();
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference]),
};
let urlbarListener = {
@ -312,8 +312,8 @@ let urlbarListener = {
}
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
};
let BrowserUsageTelemetry = {
@ -341,8 +341,8 @@ let BrowserUsageTelemetry = {
URICountListener.reset();
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
uninit() {
if (!this._inited) {

2
browser/modules/FormSubmitObserver.jsm
View File

@ -227,5 +227,5 @@ FormSubmitObserver.prototype =
(target.ownerDocument && target.ownerDocument == this._content.document));
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver])
QueryInterface: ChromeUtils.generateQI([Ci.nsIFormSubmitObserver])
};

2
browser/modules/Sanitizer.jsm
View File

@ -269,7 +269,7 @@ var Sanitizer = {
}
},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsiObserver,
Ci.nsISupportsWeakReference
]),

2
browser/modules/SiteDataManager.jsm
View File

@ -111,7 +111,7 @@ var SiteDataManager = {
this._getCacheSizeObserver = null;
},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsICacheStorageConsumptionObserver,
Ci.nsISupportsWeakReference
])

4
browser/modules/WindowsPreviewPerTab.jsm
View File

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

2
browser/modules/test/browser/browser_UsageTelemetry_domains.js
View File

@ -31,7 +31,7 @@ function browserLocationChanged(browser) {
resolve();
}
},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsIWebProgressListener2,
]),

2
browser/modules/test/browser/contentSearch.js
View File

@ -69,7 +69,7 @@ function waitForLoadAndStopIt(expectedURL) {
}
}
},
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
]),

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

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

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

@ -170,7 +170,7 @@ function checkEvents(events, expectedEvents) {
function makeMockPermissionRequest(browser) {
let type = {
options: [],
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionType]),
};
let types = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
types.appendElement(type);
@ -186,7 +186,7 @@ function makeMockPermissionRequest(browser) {
allow() {
this._allowed = true;
},
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionRequest]),
};
// In the e10s-case, nsIContentPermissionRequest will have

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

@ -34,7 +34,7 @@ ProtocolHandler.prototype =
},
newChannel2() { throw Cr.NS_ERROR_NOT_IMPLEMENTED; },
newChannel() { throw Cr.NS_ERROR_NOT_IMPLEMENTED; },
QueryInterface: XPCOMUtils.generateQI([
QueryInterface: ChromeUtils.generateQI([
Ci.nsIProtocolHandler
])
};

3
devtools/client/responsive.html/browser/web-navigation.js
View File

@ -34,8 +34,7 @@ function BrowserElementWebNavigation(browser) {
BrowserElementWebNavigation.prototype = {
QueryInterface: XPCOMUtils.generateQI([
Ci.nsIWebNavigation,
Ci.nsISupports
Ci.nsIWebNavigation
]),
get _mm() {

2
devtools/client/webconsole/test/mochitest/browser_webconsole_network_requests_from_chrome.js
View File

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

4
devtools/client/webconsole/test/mochitest/browser_webconsole_observer_notifications.js
View File

@ -21,10 +21,8 @@ add_task(async function() {
});
function setupObserver() {
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
const observer = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
observe: function observe(subject, topic) {
subject = subject.QueryInterface(Ci.nsISupportsString);

3
devtools/server/actors/highlighters.js
View File

@ -581,8 +581,7 @@ HighlighterEnvironment.prototype = {
this.listener = {
QueryInterface: XPCOMUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
Ci.nsISupports
Ci.nsISupportsWeakReference
]),
onStateChange: function(progress, request, flag) {

1
devtools/server/actors/tab.js
View File

@ -1508,7 +1508,6 @@ DebuggerProgressListener.prototype = {
QueryInterface: XPCOMUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
Ci.nsISupports,
]),
destroy() {

3
devtools/server/actors/webextension-inspected-window.js
View File

@ -113,8 +113,7 @@ function CustomizedReload(params) {
CustomizedReload.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
Ci.nsISupports]),
Ci.nsISupportsWeakReference]),
get window() {
return this.docShell.DOMWindow;
},

3
devtools/shared/webconsole/network-monitor.js
View File

@ -286,8 +286,7 @@ function NetworkResponseListener(owner, httpActivity) {
NetworkResponseListener.prototype = {
QueryInterface:
XPCOMUtils.generateQI([Ci.nsIStreamListener, Ci.nsIInputStreamCallback,
Ci.nsIRequestObserver, Ci.nsIInterfaceRequestor,
Ci.nsISupports]),
Ci.nsIRequestObserver, Ci.nsIInterfaceRequestor]),
// nsIInterfaceRequestor implementation

3
devtools/shared/webconsole/throttle.js
View File

@ -42,8 +42,7 @@ function NetworkThrottleListener(queue) {
NetworkThrottleListener.prototype = {
QueryInterface:
XPCOMUtils.generateQI([Ci.nsIStreamListener, Ci.nsIInterfaceRequestor,
Ci.nsISupports]),
XPCOMUtils.generateQI([Ci.nsIStreamListener, Ci.nsIInterfaceRequestor]),
/**
* Set the original listener for this object. The original listener

2
devtools/startup/aboutdebugging-registration.js
View File

@ -21,7 +21,7 @@ AboutDebugging.prototype = {
classID: Components.ID("1060afaf-dc9e-43da-8646-23a2faf48493"),
contractID: "@mozilla.org/network/protocol/about;1?what=debugging",
QueryInterface: XPCOMUtils.generateQI([nsIAboutModule]),
QueryInterface: ChromeUtils.generateQI([nsIAboutModule]),
newChannel: function(uri, loadInfo) {
let chan = Services.io.newChannelFromURIWithLoadInfo(

2
devtools/startup/aboutdevtools/aboutdevtools-registration.js
View File

@ -19,7 +19,7 @@ AboutDevtools.prototype = {
classID: Components.ID("3a16d383-92bd-4c24-ac10-0e2bd66883ab"),
contractID: "@mozilla.org/network/protocol/about;1?what=devtools",
QueryInterface: XPCOMUtils.generateQI([nsIAboutModule]),
QueryInterface: ChromeUtils.generateQI([nsIAboutModule]),
newChannel: function(uri, loadInfo) {
let chan = Services.io.newChannelFromURIWithLoadInfo(

2
devtools/startup/aboutdevtoolstoolbox-registration.js
View File

@ -20,7 +20,7 @@ AboutDevtoolsToolbox.prototype = {
classID: Components.ID("11342911-3135-45a8-8d71-737a2b0ad469"),
contractID: "@mozilla.org/network/protocol/about;1?what=devtools-toolbox",
QueryInterface: XPCOMUtils.generateQI([nsIAboutModule]),
QueryInterface: ChromeUtils.generateQI([nsIAboutModule]),
newChannel: function(uri, loadInfo) {
let chan = Services.io.newChannelFromURIWithLoadInfo(this.uri, loadInfo);

2
docshell/test/browser/browser_bug655270.js
View File

@ -53,7 +53,7 @@ function test() {
onDeleteURI: function() { },
onClearHistory: function() { },
onDeleteVisits: function() { },
QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver])
};
PlacesUtils.history.addObserver(observer);

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