--- a/accessible/jsat/ContentControl.jsm
+++ b/accessible/jsat/ContentControl.jsm
@@ -499,12 +499,12 @@ this.ContentControl.prototype = {
}
},
cancelAutoMove: function cc_cancelAutoMove() {
this.window.clearTimeout(this._autoMove);
this._autoMove = 0;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference,
Ci.nsIMessageListener
])
};
--- a/accessible/jsat/EventManager.jsm
+++ b/accessible/jsat/EventManager.jsm
@@ -557,20 +557,17 @@ this.EventManager.prototype = {
}
},
onLocationChange: function onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
let docAcc = Utils.AccService.getAccessibleFor(aWebProgress.DOMWindow.document);
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 = {
/**
* A WeakMap containing [content, EventManager] pairs.
*/
eventManagers: new WeakMap(),
--- a/accessible/jsat/Traversal.jsm
+++ b/accessible/jsat/Traversal.jsm
@@ -62,17 +62,17 @@ BaseTraversalRule.prototype = {
if (control && this._explicitMatchRoles.has(control.role)) {
matchResult = this._matchFunc(control) | Filters.IGNORE_SUBTREE;
}
}
return matchResult;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAccessibleTraversalRule])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAccessibleTraversalRule])
};
var gSimpleTraversalRoles =
[Roles.MENUITEM,
Roles.LINK,
Roles.PAGETAB,
Roles.GRAPHIC,
Roles.STATICTEXT,
--- a/accessible/jsat/Utils.jsm
+++ b/accessible/jsat/Utils.jsm
@@ -1052,11 +1052,11 @@ PrefCache.prototype = {
try {
this.callback(this.name, this.value, false);
} catch (x) {
Logger.logException(x);
}
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference])
};
--- a/accessible/tests/mochitest/pivot.js
+++ b/accessible/tests/mochitest/pivot.js
@@ -29,17 +29,17 @@ var HeadersTraversalRule =
},
preFilter: PREFILTER_INVISIBLE,
match(aAccessible) {
return FILTER_MATCH;
},
- QueryInterface: XPCOMUtils.generateQI([nsIAccessibleTraversalRule])
+ QueryInterface: ChromeUtils.generateQI([nsIAccessibleTraversalRule])
};
/**
* Traversal rule for all focusable nodes or leafs.
*/
var ObjectTraversalRule =
{
getMatchRoles(aRules) {
@@ -57,17 +57,17 @@ var ObjectTraversalRule =
rv = FILTER_IGNORE_SUBTREE | FILTER_MATCH;
else if (aAccessible.childCount == 0 &&
role != ROLE_STATICTEXT && aAccessible.name.trim())
rv = FILTER_MATCH;
return rv;
},
- QueryInterface: XPCOMUtils.generateQI([nsIAccessibleTraversalRule])
+ QueryInterface: ChromeUtils.generateQI([nsIAccessibleTraversalRule])
};
// //////////////////////////////////////////////////////////////////////////////
// Virtual state invokers and checkers
/**
* A checker for virtual cursor changed events.
*/
--- a/browser/base/content/browser-data-submission-info-bar.js
+++ b/browser/base/content/browser-data-submission-info-bar.js
@@ -113,13 +113,13 @@ var gDataNotificationInfoBar = {
this._actionTaken = true;
this._clearPolicyNotification();
break;
default:
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
]),
};
--- a/browser/base/content/browser-feeds.js
+++ b/browser/base/content/browser-feeds.js
@@ -407,18 +407,18 @@ var FeedHandler = {
.createInstance(Ci.nsIProcess);
p.init(clientApp);
p.run(false, [aSpec], 1);
}
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
init() {
window.messageManager.addMessageListener("FeedWriter:ChooseClientApp", this);
window.messageManager.addMessageListener("FeedWriter:GetSubscriptionUI", this);
window.messageManager.addMessageListener("FeedWriter:SetFeedPrefsAndSubscribe", this);
window.messageManager.addMessageListener("FeedWriter:ShownFirstRun", this);
--- a/browser/base/content/browser-fullZoom.js
+++ b/browser/base/content/browser-fullZoom.js
@@ -34,20 +34,17 @@ var FullZoom = {
!Services.prefs.getBoolPref("privacy.resistFingerprinting") &&
Services.prefs.getBoolPref("browser.zoom.siteSpecific");
}
return this._siteSpecificPref;
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsIContentPrefObserver,
- Ci.nsISupportsWeakReference,
- Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsIContentPrefObserver, Ci.nsISupportsWeakReference]),
// Initialization & Destruction
init: function FullZoom_init() {
gBrowser.addEventListener("ZoomChangeUsingMouseWheel", this);
// Register ourselves with the service so we know when our pref changes.
this._cps2 = Cc["@mozilla.org/content-pref/service;1"].
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1744,17 +1744,17 @@ var BookmarkingUI = {
if (aNode.id != this.BOOKMARK_BUTTON_ID || win != window)
return;
// The view gets broken by being removed and reinserted. Uninit
// here so popupshowing will generate a new one:
this._uninitView();
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver
])
};
var AutoShowBookmarksToolbar = {
init() {
Services.obs.addObserver(this, "autoshow-bookmarks-toolbar");
},
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -656,13 +656,13 @@ var gSync = {
onSyncDisabled() {
const toHide = [...document.querySelectorAll(".sync-ui-item")];
for (const item of toHide) {
item.hidden = true;
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference
])
};
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5273,17 +5273,17 @@ var TabsProgressListener = {
FullZoom.onLocationChange(aLocationURI, false, aBrowser);
},
};
function nsBrowserAccess() { }
nsBrowserAccess.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIBrowserDOMWindow, Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIBrowserDOMWindow]),
_openURIInNewTab(aURI, aReferrer, aReferrerPolicy, aIsPrivate,
aIsExternal, aForceNotRemote = false,
aUserContextId = Ci.nsIScriptSecurityManager.DEFAULT_USER_CONTEXT_ID,
aOpenerWindow = null, aOpenerBrowser = null,
aTriggeringPrincipal = null, aNextTabParentId = 0, aName = "") {
let win, needToFocusWin;
@@ -7629,18 +7629,18 @@ var RestoreLastSessionObserver = {
observe() {
// The last session can only be restored once so there's
// no way we need to re-enable our menu item.
Services.obs.removeObserver(this, "sessionstore-last-session-cleared");
goSetCommandEnabled("Browser:RestoreLastSession", false);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference])
};
function restoreLastSession() {
SessionStore.restoreLastSession();
}
/* Observes menus and adjusts their size for better
* usability when opened via a touch screen. */
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -1519,14 +1519,14 @@ let OfflineApps = {
if (aTopic == "offline-cache-update-completed") {
let cacheUpdate = aSubject.QueryInterface(Ci.nsIOfflineCacheUpdate);
let uri = cacheUpdate.manifestURI;
if (uri && this._docManifestSet.has(uri.spec)) {
sendAsyncMessage("OfflineApps:CheckUsage", {uri: uri.spec});
}
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
};
addEventListener("MozApplicationManifest", OfflineApps, false);
addMessageListener("OfflineApps:StartFetching", OfflineApps);
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -854,20 +854,17 @@ var RefreshBlocker = {
.QueryInterface(Ci.nsIRefreshURI);
let URI = Services.io.newURI(data.URI);
refreshURI.forceRefreshURI(URI, null, data.delay, true);
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener2,
- Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference,
- Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener2, Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference]),
};
RefreshBlocker.init();
var UserContextIdNotifier = {
init() {
addEventListener("DOMWindowCreated", this);
},
--- a/browser/base/content/test/about/head.js
+++ b/browser/base/content/test/about/head.js
@@ -114,17 +114,17 @@ function waitForDocLoadAndStopIt(aExpect
wp.removeProgressListener(progressListener);
let chan = req.QueryInterface(Ci.nsIChannel);
dump(`waitForDocLoadAndStopIt: Document start: ${chan.URI.spec}\n`);
stopContent(contentStopFromProgressListener, chan.originalURI.spec);
}
},
- QueryInterface: XPCOMUtils.generateQI(["nsISupportsWeakReference"])
+ QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference"])
};
wp.addProgressListener(progressListener, wp.NOTIFY_STATE_WINDOW);
/**
* As |this| is undefined and we can't extend |docShell|, adding an unload
* event handler is the easiest way to ensure the weakly referenced
* progress listener is kept alive as long as necessary.
*/
--- a/browser/base/content/test/chrome/test_aboutCrashed.xul
+++ b/browser/base/content/test/chrome/test_aboutCrashed.xul
@@ -27,18 +27,18 @@
.getInterface(Ci.nsIWebProgress)
.removeProgressListener(progressListener,
Ci.nsIWebProgress.NOTIFY_LOCATION);
resolve();
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference])
};
frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebProgress)
.addProgressListener(progressListener,
Ci.nsIWebProgress.NOTIFY_LOCATION);
});
}
--- a/browser/base/content/test/general/browser_bug356571.js
+++ b/browser/base/content/test/general/browser_bug356571.js
@@ -17,17 +17,17 @@ var fakePromptServiceFactory = {
createInstance(aOuter, aIid) {
if (aOuter != null)
throw Cr.NS_ERROR_NO_AGGREGATION;
return promptService.QueryInterface(aIid);
}
};
var promptService = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
alert() {
didFail = true;
}
};
/* FIXME
Cm.QueryInterface(Ci.nsIComponentRegistrar)
.registerFactory(Components.ID(kPromptServiceUUID), "Prompt Service",
--- a/browser/base/content/test/general/browser_e10s_about_process.js
+++ b/browser/base/content/test/general/browser_e10s_about_process.js
@@ -41,31 +41,31 @@ AboutModule.prototype = {
ok(false, "Called getURIFlags for an unknown page " + aURI.spec);
return 0;
},
getIndexedDBOriginPostfix(aURI) {
return null;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule])
};
var AboutModuleFactory = {
createInstance(aOuter, aIID) {
if (aOuter)
throw Cr.NS_ERROR_NO_AGGREGATION;
return new AboutModule().QueryInterface(aIID);
},
lockFactory(aLock) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
};
add_task(async function init() {
let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
for (let module of TEST_MODULES) {
registrar.registerFactory(Components.ID(module.id), "",
"@mozilla.org/network/protocol/about;1?what=" + module.path,
AboutModuleFactory);
--- a/browser/base/content/test/general/browser_fullscreen-window-open.js
+++ b/browser/base/content/test/general/browser_fullscreen-window-open.js
@@ -337,11 +337,10 @@ WindowListener.prototype = {
} else {
domwindow.close();
executeSoon(this.callBack_onFinalize);
}
};
domwindow.addEventListener("load", onLoad, true);
},
onCloseWindow(aXULWindow) {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowMediatorListener,
- Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowMediatorListener]),
};
--- a/browser/base/content/test/general/browser_homeDrop.js
+++ b/browser/base/content/test/general/browser_homeDrop.js
@@ -24,17 +24,17 @@ add_task(async function() {
EventUtils.synthesizeDrop(dragSrcElement, homeButton, dragData, "copy", window);
let setHomepageDialog = await setHomepageDialogPromise;
ok(true, "dialog appeared in response to home button drop");
await BrowserTestUtils.waitForEvent(setHomepageDialog, "load", false);
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");
let modified = Services.prefs.getStringPref(HOMEPAGE_PREF);
is(modified, homepage, "homepage is set correctly");
Services.prefs.removeObserver(HOMEPAGE_PREF, observer);
Services.prefs.setStringPref(HOMEPAGE_PREF, "about:mozilla;");
--- a/browser/base/content/test/general/head.js
+++ b/browser/base/content/test/general/head.js
@@ -560,17 +560,17 @@ function promiseOnBookmarkItemAdded(aExp
}
},
onBeginUpdateBatch() {},
onEndUpdateBatch() {},
onItemRemoved() {},
onItemChanged() {},
onItemVisited() {},
onItemMoved() {},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver,
])
};
info("Waiting for a bookmark to be added");
PlacesUtils.bookmarks.addObserver(bookmarksObserver);
});
}
--- a/browser/base/content/test/performance/head.js
+++ b/browser/base/content/test/performance/head.js
@@ -49,18 +49,18 @@ async function recordReflows(testPromise
dirtyFrame(win);
},
reflowInterruptible(start, end) {
// Interruptible reflows are the reflows caused by the refresh
// 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)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShell);
docShell.addWeakReflowObserver(observer);
let dirtyFrameFn = event => {
--- a/browser/base/content/test/plugins/blocklist_proxy.js
+++ b/browser/base/content/test/plugins/blocklist_proxy.js
@@ -8,19 +8,19 @@ ChromeUtils.import("resource://gre/modul
ChromeUtils.import("resource://gre/modules/Timer.jsm");
/*
* A lightweight blocklist proxy for the testing purposes.
*/
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) {
this._uuid =
Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator)
.generateUUID();
Cm.nsIComponentRegistrar.registerFactory(this._uuid, "",
"@mozilla.org/extensions/blocklist;1",
--- a/browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js
+++ b/browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js
@@ -199,17 +199,17 @@ function checkAutocompleteResults(aExpec
ok(false, "'" + entry + "' should be found in autocomplete");
}
executeSoon(aCallback);
},
setSelectedIndex() {},
get searchCount() { return this.searches.length; },
getSearchAt(aIndex) { return this.searches[aIndex]; },
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIAutoCompleteInput,
Ci.nsIAutoCompletePopup,
])
};
info("Searching open pages.");
gController.startSearch(RESTRICT_TOKEN_OPENPAGE);
}
--- a/browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js
+++ b/browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js
@@ -27,17 +27,17 @@ const clientAuthDialogs = {
ok(expectingChooseCertificate,
`${expectingChooseCertificate ? "" : "not "}expecting chooseCertificate to be called`);
is(certList.length, 1, "should have only one client certificate available");
selectedIndex.value = 0;
chooseCertificateCalled = true;
return true;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIClientAuthDialogs]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIClientAuthDialogs]),
};
function startServer(cert) {
let tlsServer = Cc["@mozilla.org/network/tls-server-socket;1"]
.createInstance(Ci.nsITLSServerSocket);
tlsServer.init(-1, true, -1);
tlsServer.serverCert = cert;
--- a/browser/base/content/test/urlbar/head.js
+++ b/browser/base/content/test/urlbar/head.js
@@ -53,17 +53,17 @@ function waitForDocLoadAndStopIt(aExpect
wp.removeProgressListener(progressListener);
let chan = req.QueryInterface(Ci.nsIChannel);
dump(`waitForDocLoadAndStopIt: Document start: ${chan.URI.spec}\n`);
stopContent(contentStopFromProgressListener, chan.originalURI.spec);
}
},
- QueryInterface: XPCOMUtils.generateQI(["nsISupportsWeakReference"])
+ QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference"])
};
wp.addProgressListener(progressListener, wp.NOTIFY_STATE_WINDOW);
/**
* As |this| is undefined and we can't extend |docShell|, adding an unload
* event handler is the easiest way to ensure the weakly referenced
* progress listener is kept alive as long as necessary.
*/
--- a/browser/components/about/nsAboutCapabilities.js
+++ b/browser/components/about/nsAboutCapabilities.js
@@ -62,13 +62,12 @@ nsAboutCapabilities.prototype = {
},
isWindowPrivate() {
return PrivateBrowsingUtils.isContentWindowPrivate(this.window);
},
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]);
--- a/browser/components/downloads/DownloadsCommon.jsm
+++ b/browser/components/downloads/DownloadsCommon.jsm
@@ -72,18 +72,18 @@ const kDownloadsStringsRequiringPluralFo
otherDownloads3: true
};
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]) {
case "boolean":
return kPrefBranch.getBoolPref(name);
}
} catch (ex) { }
return this.prefs[name];
--- a/browser/components/enterprisepolicies/EnterprisePolicies.js
+++ b/browser/components/enterprisepolicies/EnterprisePolicies.js
@@ -64,19 +64,19 @@ function EnterprisePoliciesManager() {
Services.obs.addObserver(this, "final-ui-startup", true);
Services.obs.addObserver(this, "sessionstore-windows-restored", true);
Services.obs.addObserver(this, "EnterprisePolicies:Restart", true);
}
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,
_initialize() {
let provider = this._chooseProvider();
if (!provider) {
--- a/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
+++ b/browser/components/enterprisepolicies/EnterprisePoliciesContent.js
@@ -46,17 +46,17 @@ function EnterprisePoliciesManagerConten
Services.cpmm.addMessageListener("EnterprisePolicies:DisallowFeature", this);
Services.cpmm.addMessageListener("EnterprisePolicies:Restart", this);
}
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,
_status: Ci.nsIEnterprisePolicies.INACTIVE,
_disallowedFeatures: [],
--- a/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
+++ b/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
@@ -74,18 +74,18 @@ function WebsiteFilter(blocklist, except
if (exceptionArray.length) {
this._exceptionsPatterns = new MatchPatternSet(exceptionArray);
}
Services.obs.addObserver(this, "http-on-modify-request", true);
}
WebsiteFilter.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
let channel, isDocument = false;
try {
channel = subject.QueryInterface(Ci.nsIHttpChannel);
isDocument = channel.isDocument;
} catch (e) {
return;
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_search_engine.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_search_engine.js
@@ -155,21 +155,21 @@ add_task(async function test_opensearch_
add_task(async function test_AddSearchProvider() {
// Mock the modal error dialog
let mockPrompter = {
promptCount: 0,
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;
registerCleanupFunction(() => {
Services.ww = origWindowWatcher;
});
let engineURL = getRootDirectory(gTestPath) + "opensearchEngine.xml";
--- a/browser/components/extensions/parent/ext-tabs.js
+++ b/browser/components/extensions/parent/ext-tabs.js
@@ -1164,17 +1164,17 @@ this.tabs = class extends ExtensionAPI {
resolve(retval == 0 ? "saved" : "replaced");
}
},
onStatusChange: function(webProgress, request, status, message) {
if (status != 0) {
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);
} else {
// Cancel clicked (retval == 1)
resolve("canceled");
}
});
--- a/browser/components/feeds/FeedWriter.js
+++ b/browser/components/feeds/FeedWriter.js
@@ -976,13 +976,13 @@ FeedWriter.prototype = {
}
});
} else {
subscribeCallback();
}
},
classID: FEEDWRITER_CID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsIDOMGlobalPropertyInitializer])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsIDOMGlobalPropertyInitializer])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FeedWriter]);
--- a/browser/components/feeds/WebContentConverter.js
+++ b/browser/components/feeds/WebContentConverter.js
@@ -860,17 +860,17 @@ WebContentConverterRegistrar.prototype =
return this.QueryInterface(iid);
},
classID: WCCR_CLASSID,
/**
* See nsISupports
*/
- QueryInterface: XPCOMUtils.generateQI(
+ QueryInterface: ChromeUtils.generateQI(
[Ci.nsIWebContentConverterService,
Ci.nsIWebContentHandlerRegistrar,
Ci.nsIObserver,
Ci.nsIFactory]),
_xpcom_categories: [{
category: "app-startup",
service: true
@@ -1039,17 +1039,17 @@ WebContentConverterRegistrarContent.prot
return this.QueryInterface(iid);
},
classID: WCCR_CLASSID,
/**
* See nsISupports
*/
- QueryInterface: XPCOMUtils.generateQI(
+ QueryInterface: ChromeUtils.generateQI(
[Ci.nsIWebContentHandlerRegistrar,
Ci.nsIWebContentConverterService,
Ci.nsIFactory])
};
this.NSGetFactory =
(Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) ?
XPCOMUtils.generateNSGetFactory([WebContentConverterRegistrarContent]) :
--- a/browser/components/migration/AutoMigrate.jsm
+++ b/browser/components/migration/AutoMigrate.jsm
@@ -674,17 +674,17 @@ const AutoMigrate = {
return;
}
let url = Services.urlFormatter.formatURL(rawURL);
url = url.replace("%IMPORTEDBROWSER%", encodeURIComponent(migrationBrowser));
chromeWindow.openTrustedLinkIn(url, "tab");
},
- QueryInterface: XPCOMUtils.generateQI(
+ QueryInterface: ChromeUtils.generateQI(
[Ci.nsIObserver, Ci.nsINavBookmarkObserver, Ci.nsISupportsWeakReference]
),
/**
* Undo action called by the UndoNotification or by the newtab
* @param chromeWindow A reference to the window in which to open a link.
*/
undoAutoMigration(chromeWindow) {
--- a/browser/components/migration/MigrationUtils.jsm
+++ b/browser/components/migration/MigrationUtils.jsm
@@ -80,17 +80,17 @@ function getMigrationBundle() {
* 3. Set classDescription, contractID and classID for your migrator, and set
* NSGetFactory appropriately.
* 4. If the migrator supports multiple profiles, override the sourceProfiles
* Here we default for single-profile migrator.
* 5. Implement getResources(aProfile) (see below).
* 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.
*
* Returns array of profile objects from which data may be imported. The object
* should have the following keys:
* id - a unique string identifier for the profile
* name - a pretty name to display to the user in the UI
--- a/browser/components/migration/ProfileMigrator.js
+++ b/browser/components/migration/ProfileMigrator.js
@@ -7,15 +7,15 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
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"),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ProfileMigrator]);
--- a/browser/components/newtab/aboutNewTabService.js
+++ b/browser/components/newtab/aboutNewTabService.js
@@ -87,17 +87,17 @@ AboutNewTabService.prototype = {
_activityStreamEnabled: false,
_activityStreamPrerender: false,
_activityStreamPath: "",
_activityStreamDebug: false,
_overridden: false,
willNotifyUser: false,
classID: Components.ID("{dfcd2adc-7867-4d3a-ba70-17501f208142}"),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIAboutNewTabService,
Ci.nsIObserver
]),
_xpcom_categories: [{
service: true
}],
observe(subject, topic, data) {
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -281,20 +281,20 @@ nsBrowserContentHandler.prototype = {
createInstance: function bch_factory_ci(outer, iid) {
if (outer)
throw Cr.NS_ERROR_NO_AGGREGATION;
return gBrowserContentHandler.QueryInterface(iid);
}
},
/* 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) {
if (cmdLine.handleFlag("browser", false)) {
openBrowserWindow(cmdLine);
cmdLine.preventDefault = true;
}
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -2719,18 +2719,18 @@ BrowserGlue.prototype = {
} else {
AppMenuNotifications.removeNotification("fxa-needs-authentication");
}
},
// 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),
};
/**
* ContentPermissionIntegration is responsible for showing the user
* simple permission prompts when content requests additional
* capabilities.
@@ -2779,17 +2779,17 @@ const ContentPermissionIntegration = {
},
};
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
* that there's only one nsIContentPermissionType in the request,
* and that it's of type nsIContentPermissionType. Failing to
* satisfy either of these conditions will result in this method
* throwing NS_ERRORs. If the combined ContentPermissionIntegration
* cannot construct a prompt for this particular request, an
@@ -3032,17 +3032,17 @@ var DefaultBrowserCheck = {
*/
var JawsScreenReaderVersionCheck = {
_prompted: false,
init() {
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") {
Services.tm.dispatchToMainThread(() => this._checkVersionAndPrompt());
}
},
onWindowsRestored() {
--- a/browser/components/places/content/browserPlacesViews.js
+++ b/browser/components/places/content/browserPlacesViews.js
@@ -36,17 +36,17 @@ PlacesViewBase.prototype = {
// The xul element that represents the root container.
_rootElt: null,
// Set to true for views that are represented by native widgets (i.e.
// the native mac menu).
_nativeView: false,
- QueryInterface: XPCOMUtils.generateQI(
+ QueryInterface: ChromeUtils.generateQI(
[Ci.nsINavHistoryResultObserver,
Ci.nsISupportsWeakReference]),
_place: "",
get place() {
return this._place;
},
set place(val) {
--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -83,17 +83,17 @@ PlacesController.prototype = {
*/
_view: null,
// This is used in certain views to disable user actions on the places tree
// views. This avoids accidental deletion/modification when the user is not
// actually organising the trees.
disableUserActions: false,
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIClipboardOwner
]),
// nsIClipboardOwner
LosingOwnership: function PC_LosingOwnership(aXferable) {
this.cutNodes = [];
},
--- a/browser/components/places/content/editBookmark.js
+++ b/browser/components/places/content/editBookmark.js
@@ -460,17 +460,17 @@ var gEditItemOverlay = {
this._folderMenuList.selectedIndex);
// Hide the folders-separator if no folder is annotated as recently-used
this._element("foldersSeparator").hidden = (menupopup.childNodes.length <= 6);
this._folderMenuList.disabled = this.readOnly;
},
QueryInterface:
- XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver]),
+ ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]),
_element(aID) {
return document.getElementById("editBMPanel_" + aID);
},
uninitPanel(aHideCollapsibleElements) {
if (aHideCollapsibleElements) {
// Hide the folder tree if it was previously visible.
--- a/browser/components/places/tests/browser/browser_editBookmark_keywords.js
+++ b/browser/components/places/tests/browser/browser_editBookmark_keywords.js
@@ -11,17 +11,17 @@ add_task(async function() {
onItemAdded() {},
onItemRemoved() {},
onItemVisited() {},
onItemMoved() {},
onItemChanged(id, property, isAnno, value) {
PlacesUtils.bookmarks.removeObserver(this);
resolve({ property, value });
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver])
});
});
}
let tab = await BrowserTestUtils.openNewForegroundTab({
gBrowser,
opening: TEST_URL,
waitForStateStop: true
--- a/browser/components/places/tests/browser/browser_views_liveupdate.js
+++ b/browser/components/places/tests/browser/browser_views_liveupdate.js
@@ -122,17 +122,17 @@ add_task(async function test() {
}
});
/**
* The observer is where magic happens, for every change we do it will look for
* nodes positions in the affected views.
*/
var bookmarksObserver = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver,
Ci.nsIAnnotationObserver
]),
// nsIAnnotationObserver
onItemAnnotationSet() {},
onItemAnnotationRemoved() {},
onPageAnnotationSet() {},
--- a/browser/components/places/tests/unit/head_bookmarks.js
+++ b/browser/components/places/tests/unit/head_bookmarks.js
@@ -71,17 +71,17 @@ function rebuildSmartBookmarks() {
let consoleListener = {
observe(aMsg) {
if (aMsg.message.startsWith("[JavaScript Warning:")) {
// TODO (Bug 1300416): Ignore spurious strict warnings.
return;
}
do_throw("Got console message: " + aMsg.message);
},
- QueryInterface: XPCOMUtils.generateQI([ Ci.nsIConsoleListener ]),
+ QueryInterface: ChromeUtils.generateQI([ Ci.nsIConsoleListener ]),
};
Services.console.reset();
Services.console.registerListener(consoleListener);
registerCleanupFunction(() => {
try {
Services.console.unregisterListener(consoleListener);
} catch (ex) { /* will likely fail */ }
});
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -1288,17 +1288,17 @@ var gMainPane = {
Services.prefs.removeObserver(PREF_AUDIO_FEED_SELECTED_READER, this);
Services.prefs.removeObserver(PREF_CONTAINERS_EXTENSION, this);
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
// nsIObserver
async observe(aSubject, aTopic, aData) {
if (aTopic == "nsPref:changed") {
if (aData == PREF_CONTAINERS_EXTENSION) {
this.readBrowserContainersCheckbox();
return;
--- a/browser/components/preferences/in-content/tests/browser_advanced_update.js
+++ b/browser/components/preferences/in-content/tests/browser_advanced_update.js
@@ -13,17 +13,17 @@ const mockUpdateManager = {
contractId: "@mozilla.org/updates/update-manager;1",
_mockClassId: uuidGenerator.generateUUID(),
_originalClassId: "",
_originalFactory: null,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdateManager]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateManager]),
createInstance(outer, iiD) {
if (outer) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return this.QueryInterface(iiD);
},
--- a/browser/components/preferences/translation.js
+++ b/browser/components/preferences/translation.js
@@ -65,17 +65,17 @@ Tree.prototype = {
return "";
},
getColumnProperties(column) {
return "";
},
getCellProperties(row, column) {
return "";
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITreeView])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITreeView])
};
function Lang(aCode, label) {
this.langCode = aCode;
this._label = label;
}
Lang.prototype = {
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
@@ -83,17 +83,17 @@ add_task(async function test_toggleTrack
let { win, tab } = await openAboutPrivateBrowsing();
// Set up the observer for the preference change before triggering the action.
let prefBranch =
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();
},
};
prefBranch.addObserver("enabled", prefObserver);
});
--- a/browser/components/search/test/head.js
+++ b/browser/components/search/test/head.js
@@ -88,18 +88,18 @@ let promiseStateChangeFrameScript = "dat
() => {
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
/* globals docShell, sendAsyncMessage */
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
if (!webProgress.isTopLevel ||
!(flags & Ci.nsIWebProgressListener.STATE_START)) {
return;
}
--- a/browser/components/sessionstore/ContentRestore.jsm
+++ b/browser/components/sessionstore/ContentRestore.jsm
@@ -366,17 +366,17 @@ ContentRestoreInternal.prototype = {
function HistoryListener(docShell, callback) {
let webNavigation = docShell.QueryInterface(Ci.nsIWebNavigation);
webNavigation.sessionHistory.legacySHistory.addSHistoryListener(this);
this.webNavigation = webNavigation;
this.callback = callback;
}
HistoryListener.prototype = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
]),
uninstall() {
let shistory = this.webNavigation.sessionHistory.legacySHistory;
if (shistory) {
shistory.removeSHistoryListener(this);
@@ -446,17 +446,17 @@ function ProgressListener(docShell, call
.getInterface(Ci.nsIWebProgress);
webProgress.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_STATE_WINDOW);
this.webProgress = webProgress;
this.callbacks = callbacks;
}
ProgressListener.prototype = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference
]),
uninstall() {
this.webProgress.removeProgressListener(this);
},
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -433,17 +433,17 @@ var SessionStore = {
}
},
};
// Freeze the SessionStore object. We don't want anyone to modify it.
Object.freeze(SessionStore);
var SessionStoreInternal = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference
]),
_globalState: new GlobalState(),
// A counter to be used to generate a unique ID for each closed tab or window.
_nextClosedId: 0,
--- a/browser/components/sessionstore/content/content-sessionStore.js
+++ b/browser/components/sessionstore/content/content-sessionStore.js
@@ -137,18 +137,18 @@ var StateChangeNotifier = {
if (stateFlags & Ci.nsIWebProgressListener.STATE_START) {
this.notifyObservers("onPageLoadStarted");
} else if (stateFlags & Ci.nsIWebProgressListener.STATE_STOP) {
this.notifyObservers("onPageLoadCompleted");
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference])
};
/**
* Listens for and handles content events that we need for the
* session store service to be notified of state changes in content.
*/
var EventListener = {
@@ -442,17 +442,17 @@ var SessionHistoryListener = {
OnLengthChanged(aCount) {
// Ignore, the method is implemented so that XPConnect doesn't throw!
},
OnIndexChanged(aIndex) {
// Ignore, the method is implemented so that XPConnect doesn't throw!
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
])
};
/**
* Listens for scroll position changes. Whenever the user scrolls the top-most
* frame we update the scroll position and will restore it when requested.
@@ -694,18 +694,18 @@ var PrivacyListener = {
}
},
// Ci.nsIPrivacyTransitionObserver
privateModeChanged(enabled) {
MessageQueue.push("isPrivate", () => enabled || null);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrivacyTransitionObserver,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrivacyTransitionObserver,
+ Ci.nsISupportsWeakReference])
};
/**
* A message queue that takes collected data and will take care of sending it
* to the chrome process. It allows flushing using synchronous messages and
* takes care of any race conditions that might occur because of that. Changes
* will be batched if they're pushed in quick succession to avoid a message
* flood.
--- a/browser/components/sessionstore/nsSessionStartup.js
+++ b/browser/components/sessionstore/nsSessionStartup.js
@@ -351,15 +351,15 @@ SessionStartup.prototype = {
/**
* Get whether the previous session crashed.
*/
get previousSessionCrashed() {
return this._previousSessionCrashed;
},
/* ........ 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}")
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SessionStartup]);
--- a/browser/components/sessionstore/test/browser_599909.js
+++ b/browser/components/sessionstore/test/browser_599909.js
@@ -106,17 +106,17 @@ function checkAutocompleteResults(aExpec
executeSoon(aCallback);
},
setSelectedIndex() {},
get searchCount() { return this.searches.length; },
getSearchAt(aIndex) {
return this.searches[aIndex];
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIAutoCompleteInput,
Ci.nsIAutoCompletePopup,
])
};
info("Searching open pages.");
gController.startSearch(RESTRICT_TOKEN_OPENPAGE);
}
--- a/browser/components/sessionstore/test/browser_async_remove_tab.js
+++ b/browser/components/sessionstore/test/browser_async_remove_tab.js
@@ -43,17 +43,17 @@ function promiseNewLocationAndHistoryEnt
return new Promise(resolve => {
let listener = {
OnHistoryReplaceEntry() {
shistory.removeSHistoryListener(this);
resolve();
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
])
};
shistory.addSHistoryListener(listener);
/* Keep the weak shistory listener alive. */
@@ -73,17 +73,17 @@ function promiseHistoryEntryReplacedNonR
let shistory = browser.webNavigation.sessionHistory.legacySHistory;
let listener = {
OnHistoryReplaceEntry() {
shistory.removeSHistoryListener(this);
executeSoon(resolve);
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
])
};
shistory.addSHistoryListener(listener);
listeners.set(browser, listener);
});
--- a/browser/components/sessionstore/test/browser_not_collect_when_idle.js
+++ b/browser/components/sessionstore/test/browser_not_collect_when_idle.js
@@ -20,17 +20,17 @@ var idleService = {
_fireObservers(state) {
for (let observer of this._observers.values()) {
observer.observe(observer, state, null);
this._activity.observerFires.push(state);
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIIdleService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIIdleService]),
idleTime: 19999,
addIdleObserver(observer, time) {
this._observers.add(observer);
this._activity.addCalls.push(time);
},
removeIdleObserver(observer, time) {
--- a/browser/components/sessionstore/test/browser_parentProcessRestoreHash.js
+++ b/browser/components/sessionstore/test/browser_parentProcessRestoreHash.js
@@ -7,17 +7,17 @@ const SELFCHROMEURL =
const Cm = Components.manager;
const TESTCLASSID = "78742c04-3630-448c-9be3-6c5070f062de";
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 |
Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT |
Ci.nsIAboutModule.HIDE_FROM_ABOUTABOUT;
},
newChannel(aURI, aLoadInfo) {
--- a/browser/components/sessionstore/test/content.js
+++ b/browser/components/sessionstore/test/content.js
@@ -41,17 +41,17 @@ var historyListener = {
sendAsyncMessage("ss-test:OnHistoryReload");
return true;
},
OnHistoryReplaceEntry() {
sendAsyncMessage("ss-test:OnHistoryReplaceEntry");
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsISHistoryListener,
Ci.nsISupportsWeakReference
])
};
var {sessionHistory} = docShell.QueryInterface(Ci.nsIWebNavigation);
if (sessionHistory) {
sessionHistory.legacySHistory.addSHistoryListener(historyListener);
--- a/browser/components/shell/HeadlessShell.jsm
+++ b/browser/components/shell/HeadlessShell.jsm
@@ -34,18 +34,18 @@ function loadContentWindow(webNavigation
let contentWindow = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow);
progressListeners.delete(progressListener);
webProgress.removeProgressListener(progressListener);
contentWindow.addEventListener("load", (event) => {
resolve(contentWindow);
}, { once: true });
},
- QueryInterface: XPCOMUtils.generateQI(["nsIWebProgressListener",
- "nsISupportsWeakReference"])
+ QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
+ "nsISupportsWeakReference"])
};
progressListeners.set(progressListener, progressListener);
webProgress.addProgressListener(progressListener,
Ci.nsIWebProgress.NOTIFY_LOCATION);
});
}
async function takeScreenshot(fullWidth, fullHeight, contentWidth, contentHeight, path, url) {
--- a/browser/components/tests/browser/browser_contentpermissionprompt.js
+++ b/browser/components/tests/browser/browser_contentpermissionprompt.js
@@ -21,17 +21,17 @@ XPCOMUtils.defineLazyServiceGetter(this,
* Example: "geo", "desktop-notification".
* @return nsIContentPermissionType implementation.
*/
function MockContentPermissionType(type) {
this.type = 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.
wrappedJSObject: this,
};
/**
* This is a partial implementation of nsIContentPermissionRequest.
@@ -44,17 +44,17 @@ MockContentPermissionType.prototype = {
function MockContentPermissionRequest(typesArray) {
this.types = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
for (let type of typesArray) {
this.types.appendElement(type);
}
}
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.
wrappedJSObject: this,
// For some of our tests, we want to make sure that the
// request is cancelled, so we add some instrumentation here
// to check that cancel() is called.
cancel() {
@@ -95,17 +95,17 @@ add_task(async function test_multiple_ty
/**
* Tests that if the nsIContentPermissionRequest has a type that
* does not implement nsIContentPermissionType that NS_NOINTERFACE
* is thrown, and the request is cancelled.
*/
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); },
/NS_NOINTERFACE/);
Assert.ok(mockRequest.cancelled, "Should have cancelled the request.");
});
/**
--- a/browser/components/tests/startupRecorder.js
+++ b/browser/components/tests/startupRecorder.js
@@ -52,17 +52,17 @@ function startupRecorder() {
code: {},
prefStats: {},
};
this.done = new Promise(resolve => { this._resolve = resolve; });
}
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))
return;
this.data.code[name] = {
components: this.loader.loadedComponents(),
modules: this.loader.loadedModules(),
--- a/browser/components/translation/TranslationContentHandler.jsm
+++ b/browser/components/translation/TranslationContentHandler.jsm
@@ -100,18 +100,18 @@ TranslationContentHandler.prototype = {
state: STATE_OFFER,
originalShown: true,
detectedLanguage: result.language
};
this.global.sendAsyncMessage("Translation:DocumentState", data);
});
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference]),
receiveMessage(msg) {
switch (msg.name) {
case "Translation:TranslateDocument":
{
ChromeUtils.import("resource:///modules/translation/TranslationDocument.jsm");
// If a TranslationDocument already exists for this document, it should
--- a/browser/components/uitour/test/browser_UITour_defaultBrowser.js
+++ b/browser/components/uitour/test/browser_UITour_defaultBrowser.js
@@ -5,17 +5,17 @@ var gContentAPI;
var gContentWindow;
var setDefaultBrowserCalled = false;
Services.scriptloader
.loadSubScript("chrome://mochikit/content/tests/SimpleTest/MockObjects.js", this);
function MockShellService() {}
MockShellService.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIShellService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIShellService]),
isDefaultBrowser(aStartupCheck, aForAllTypes) { return false; },
setDefaultBrowser(aClaimAllTypes, aForAllUsers) {
setDefaultBrowserCalled = true;
},
shouldCheckDefaultBrowser: false,
canSetDesktopBackground: false,
BACKGROUND_TILE: 1,
BACKGROUND_STRETCH: 2,
--- a/browser/extensions/activity-stream/lib/PlacesFeed.jsm
+++ b/browser/extensions/activity-stream/lib/PlacesFeed.jsm
@@ -17,17 +17,17 @@ const LINK_BLOCKED_EVENT = "newtab-linkB
const PLACES_LINKS_CHANGED_DELAY_TIME = 1000; // time in ms to delay timer for places links changed events
/**
* Observer - a wrapper around history/bookmark observers to add the QueryInterface.
*/
class Observer {
constructor(dispatch, observerInterface) {
this.dispatch = dispatch;
- this.QueryInterface = XPCOMUtils.generateQI([observerInterface, Ci.nsISupportsWeakReference]);
+ this.QueryInterface = ChromeUtils.generateQI([observerInterface, Ci.nsISupportsWeakReference]);
}
}
/**
* HistoryObserver - observes events from PlacesUtils.history
*/
class HistoryObserver extends Observer {
constructor(dispatch) {
--- a/browser/extensions/followonsearch/content/followonsearch-fs.js
+++ b/browser/extensions/followonsearch/content/followonsearch-fs.js
@@ -145,17 +145,17 @@ gLastSearchQueue.push = function(...args
// that started from Firefox
let searchingGoogle = false;
/**
* Since most codes are in the URL, we can handle them via
* 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)) {
return;
}
try {
if (!aWebProgress.isTopLevel ||
// Not a URL
--- a/browser/extensions/formautofill/FormAutofillContent.jsm
+++ b/browser/extensions/formautofill/FormAutofillContent.jsm
@@ -76,17 +76,17 @@ AutocompleteFactory.prototype = {
*/
function AutofillProfileAutoCompleteSearch() {
FormAutofillUtils.defineLazyLogGetter(this, "AutofillProfileAutoCompleteSearch");
}
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
/**
* Searches for a given string and notifies a listener (either synchronously
* or asynchronously) of the result
*
* @param {string} searchString the string to search for
@@ -204,17 +204,17 @@ AutofillProfileAutoCompleteSearch.protot
});
Services.cpmm.sendAsyncMessage("FormAutofill:GetRecords", data);
});
},
};
let ProfileAutocomplete = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
lastProfileAutoCompleteResult: null,
lastProfileAutoCompleteFocusedInput: null,
_registered: false,
_factory: null,
ensureRegistered() {
if (this._registered) {
@@ -319,17 +319,17 @@ let ProfileAutocomplete = {
};
/**
* Handles content's interactions for the process.
*
* 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.
*/
_formsDetails: new WeakMap(),
/**
* @type {Set} Set of the fields with usable values in any saved profile.
*/
--- a/browser/extensions/formautofill/FormAutofillParent.jsm
+++ b/browser/extensions/formautofill/FormAutofillParent.jsm
@@ -64,17 +64,17 @@ function FormAutofillParent() {
this._updateSavedFieldNames();
});
return formAutofillStorage;
});
}
FormAutofillParent.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
/**
* Cache of the Form Autofill status (considering preferences and storage).
*/
_active: null,
/**
* The status of Form Autofill's initialization.
--- a/browser/extensions/formautofill/MasterPassword.jsm
+++ b/browser/extensions/formautofill/MasterPassword.jsm
@@ -172,17 +172,17 @@ var MasterPassword = {
if (!this.isUIBusy) {
log.debug("waitForExistingDialog: Dialog isn't showing. isLoggedIn:", this.isLoggedIn);
return this.isLoggedIn;
}
return new Promise((resolve) => {
log.debug("waitForExistingDialog: Observing the open dialog");
let observer = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
]),
observe(subject, topic, data) {
log.debug("waitForExistingDialog: Got notification:", topic);
// Only run observer once.
Services.obs.removeObserver(this, "passwordmgr-crypto-login");
--- a/browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
+++ b/browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
@@ -21,17 +21,17 @@ class ProfileAutoCompleteResult {
constructor(searchString, focusedFieldName, allFieldNames, matchingProfiles, {
resultCode = null,
isSecure = true,
isInputAutofilled = false,
}) {
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;
// The field name of the focused input.
this._focusedFieldName = focusedFieldName;
// The matching profiles contains the information for filling forms.
this._matchingProfiles = matchingProfiles;
// The default item that should be entered if none is selected
--- a/browser/extensions/formautofill/test/unit/test_masterPassword.js
+++ b/browser/extensions/formautofill/test/unit/test_masterPassword.js
@@ -41,24 +41,24 @@ let gMockPrompter = {
"Please enter your master password.",
"password prompt text should be as expected");
equal(checkMsg, null, "checkMsg should be null");
ok(this.passwordToTry, "passwordToTry should be non-null");
password.value = this.passwordToTry;
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.
do_get_profile();
let windowWatcherCID =
MockRegistrar.register("@mozilla.org/embedcomp/window-watcher;1",
gWindowWatcher);
--- a/browser/extensions/pdfjs/content/PdfJs.jsm
+++ b/browser/extensions/pdfjs/content/PdfJs.jsm
@@ -122,17 +122,17 @@ Factory.prototype = {
if (this._classID2) {
registrar.unregisterFactory(this._classID2, this._factory);
}
this._factory = null;
},
};
var PdfJs = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
_registered: false,
_initialized: false,
init: function init(remote) {
if (Services.appinfo.processType !==
Services.appinfo.PROCESS_TYPE_DEFAULT) {
throw new Error("PdfJs.init should only get called " +
"in the parent process.");
--- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
+++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm
@@ -804,22 +804,17 @@ PdfStreamConverter.prototype = {
// properties required for XPCOM registration:
classID: Components.ID("{d0c5195d-e798-49d4-b1d3-9324328b2291}"),
classDescription: "pdf.js Component",
contractID: "@mozilla.org/streamconv;1?from=application/pdf&to=*/*",
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:
* 1. asyncConvertData stores the listener
* 2. onStartRequest creates a new channel, streams the viewer
* 3. If range requests are supported:
* 3.1. Leave the request open until the viewer is ready to switch to
* range requests.
--- a/browser/extensions/pocket/content/AboutPocket.jsm
+++ b/browser/extensions/pocket/content/AboutPocket.jsm
@@ -25,17 +25,17 @@ function AboutPage(chromeURL, aboutHost,
this.chromeURL = chromeURL;
this.aboutHost = aboutHost;
this.classID = Components.ID(classID);
this.description = description;
this.uriFlags = uriFlags;
}
AboutPage.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
getURIFlags(aURI) { // eslint-disable-line no-unused-vars
return this.uriFlags;
},
newChannel(aURI, aLoadInfo) {
let newURI = Services.io.newURI(this.chromeURL);
let channel = Services.io.newChannelFromURIWithLoadInfo(newURI,
aLoadInfo);
--- a/browser/extensions/webcompat-reporter/content/WebCompatReporter.jsm
+++ b/browser/extensions/webcompat-reporter/content/WebCompatReporter.jsm
@@ -103,17 +103,17 @@ let WebCompatReporter = {
`${WebCompatReporter.endpoint}?${params}`,
{inBackground: false, triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});
// If we successfully got a screenshot blob, add a listener to know when
// the new tab is loaded before sending it over.
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;
let isNetwork = flags & Ci.nsIWebProgressListener.STATE_IS_NETWORK;
if (isStopped && isNetwork && webProgress.isTopLevel) {
let location;
try {
location = request.QueryInterface(Ci.nsIChannel).URI;
--- a/browser/modules/BrowserUsageTelemetry.jsm
+++ b/browser/modules/BrowserUsageTelemetry.jsm
@@ -222,18 +222,18 @@ let URICountListener = {
/**
* Reset the counts. This should be called when breaking a session in Telemetry.
*/
reset() {
this._domainSet.clear();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference]),
};
let urlbarListener = {
// This is needed for recordUrlbarSelectedResultMethod().
selectedIndex: -1,
init() {
@@ -307,18 +307,18 @@ let urlbarListener = {
.getKeyedHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE")
.add(actionType, idx);
} else {
Cu.reportError("Unknown FX_URLBAR_SELECTED_RESULT_TYPE type: " +
actionType);
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
};
let BrowserUsageTelemetry = {
_inited: false,
init() {
this._lastRecordTabCount = 0;
urlbarListener.init();
@@ -336,18 +336,18 @@ let BrowserUsageTelemetry = {
const counts = getOpenTabsAndWinsCounts();
Services.telemetry.scalarSetMaximum(MAX_TAB_COUNT_SCALAR_NAME, counts.tabCount);
Services.telemetry.scalarSetMaximum(MAX_WINDOW_COUNT_SCALAR_NAME, counts.winCount);
// Reset the URI counter.
URICountListener.reset();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
uninit() {
if (!this._inited) {
return;
}
Services.obs.removeObserver(this, DOMWINDOW_OPENED_TOPIC);
Services.obs.removeObserver(this, TELEMETRY_SUBSESSIONSPLIT_TOPIC);
urlbarListener.uninit();
--- a/browser/modules/FormSubmitObserver.jsm
+++ b/browser/modules/FormSubmitObserver.jsm
@@ -222,10 +222,10 @@ FormSubmitObserver.prototype =
if (this._content == null) {
return true;
}
let target = aEvent.originalTarget;
return (target == this._content.document ||
(target.ownerDocument && target.ownerDocument == this._content.document));
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFormSubmitObserver])
};
--- a/browser/modules/Sanitizer.jsm
+++ b/browser/modules/Sanitizer.jsm
@@ -265,17 +265,17 @@ var Sanitizer = {
if (this.shouldSanitizeOnShutdown) {
let itemsToClear = getItemsToClearFromPrefBranch(Sanitizer.PREF_SHUTDOWN_BRANCH);
addPendingSanitization("shutdown", itemsToClear, {});
}
}
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsiObserver,
Ci.nsISupportsWeakReference
]),
// When making any changes to the sanitize implementations here,
// please check whether the changes are applicable to Android
// (mobile/android/modules/Sanitizer.jsm) as well.
--- a/browser/modules/SiteDataManager.jsm
+++ b/browser/modules/SiteDataManager.jsm
@@ -106,17 +106,17 @@ var SiteDataManager = {
// Needs to root the observer since cache service keeps only a weak reference.
this._getCacheSizeObserver = {
onNetworkCacheDiskConsumption: consumption => {
resolve(consumption);
this._getCacheSizePromise = null;
this._getCacheSizeObserver = null;
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsICacheStorageConsumptionObserver,
Ci.nsISupportsWeakReference
])
};
try {
Services.cache2.asyncGetDiskConsumption(this._getCacheSizeObserver);
} catch (e) {
--- a/browser/modules/WindowsPreviewPerTab.jsm
+++ b/browser/modules/WindowsPreviewPerTab.jsm
@@ -150,17 +150,17 @@ function PreviewController(win, tab) {
XPCOMUtils.defineLazyGetter(this, "canvasPreview", function() {
let canvas = PageThumbs.createCanvas();
canvas.mozOpaque = true;
return canvas;
});
}
PreviewController.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITaskbarPreviewController]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITaskbarPreviewController]),
destroy() {
this.tab.removeEventListener("TabAttrModified", this);
// Break cycles, otherwise we end up leaking the window with everything
// attached to it.
delete this.win;
delete this.preview;
@@ -830,17 +830,17 @@ var AeroPeek = {
if (tab.getAttribute("image") == newValue) {
win.onLinkIconAvailable(tab.linkedBrowser, newValue);
}
}
}
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsISupportsWeakReference,
Ci.nsINavHistoryObserver,
Ci.nsIObserver
]),
};
XPCOMUtils.defineLazyGetter(AeroPeek, "cacheTimer", () =>
Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer)
--- a/browser/modules/test/browser/browser_UsageTelemetry_domains.js
+++ b/browser/modules/test/browser/browser_UsageTelemetry_domains.js
@@ -26,17 +26,17 @@ function browserLocationChanged(browser)
onStatusChange() {},
onLocationChange(aWebProgress, aRequest, aURI, aFlags) {
if (!(aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE)) {
browser.webProgress.removeProgressListener(filter);
filter.removeProgressListener(wpl);
resolve();
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsIWebProgressListener2,
]),
};
const filter = Cc["@mozilla.org/appshell/component/browser-status-filter;1"]
.createInstance(Ci.nsIWebProgress);
filter.addProgressListener(wpl, Ci.nsIWebProgress.NOTIFY_ALL);
browser.webProgress.addProgressListener(filter, Ci.nsIWebProgress.NOTIFY_ALL);
--- a/browser/modules/test/browser/contentSearch.js
+++ b/browser/modules/test/browser/contentSearch.js
@@ -64,17 +64,17 @@ function waitForLoadAndStopIt(expectedUR
if ((flags & docStart) && webProg.isTopLevel && url == expectedURL) {
webProgress.removeProgressListener(webProgressListener);
webProgressListener = null;
req.cancel(Cr.NS_ERROR_FAILURE);
resolve(url);
}
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
]),
};
webProgress.addProgressListener(webProgressListener, Ci.nsIWebProgress.NOTIFY_ALL);
dump("waitForLoadAndStopIt: Waiting for URL to load: " + expectedURL + "\n");
});
}
--- a/browser/modules/test/browser/formValidation/browser_form_validation.js
+++ b/browser/modules/test/browser/formValidation/browser_form_validation.js
@@ -44,17 +44,17 @@ function checkPopupShow() {
}
function checkPopupHide() {
ok(gInvalidFormPopup.state != "showing" && gInvalidFormPopup.state != "open",
"[Test " + testId + "] The invalid form popup should not be shown");
}
var gObserver = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFormSubmitObserver]),
notifyInvalidSubmit(aFormElement, aInvalidElements) {
}
};
var testId = 0;
function incrementTest() {
--- a/browser/modules/test/browser/head.js
+++ b/browser/modules/test/browser/head.js
@@ -165,33 +165,33 @@ function checkEvents(events, expectedEve
* @param browser (<xul:browser>)
* The browser that we'll create a nsIContentPermissionRequest
* for.
* @returns A nsIContentPermissionRequest-ish object.
*/
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);
let result = {
types,
principal: browser.contentPrincipal,
requester: null,
_cancelled: false,
cancel() {
this._cancelled = true;
},
_allowed: false,
allow() {
this._allowed = true;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionRequest]),
};
// In the e10s-case, nsIContentPermissionRequest will have
// element defined. window is defined otherwise.
if (browser.isRemoteBrowser) {
result.element = browser;
} else {
result.window = browser.contentWindow;
--- a/caps/tests/mochitest/test_extensionURL.html
+++ b/caps/tests/mochitest/test_extensionURL.html
@@ -86,17 +86,17 @@ https://bugzilla.mozilla.org/show_bug.cg
// to this process' ExtensionProtocolHandler to observe substitutions
// as they are propagated to the child.
function SubstitutionObserver() {}
SubstitutionObserver.prototype = {
onSetSubstitution: SpecialPowers.wrapCallback(function(root, uri) {
popSubstitutionCallback(root);
}),
QueryInterface:
- XPCOMUtils.generateQI([SpecialPowers.Ci.nsISupports,
+ ChromeUtils.generateQI([SpecialPowers.Ci.nsISupports,
SpecialPowers.Ci.nsISubstitutionObserver]),
};
var observer = new SubstitutionObserver();
var wrappedObserver = SpecialPowers.wrap(observer);
extensionHandler.addObserver(wrappedObserver);
// Set a substitution in the parent. The parent
// propagates all substitutions to child processes.
--- a/chrome/test/unit/test_no_remote_registration.js
+++ b/chrome/test/unit/test_no_remote_registration.js
@@ -29,17 +29,17 @@ ProtocolHandler.prototype =
mutator.setSpec(aBaseURI.resolve(aSpec));
} else {
mutator.setSpec(aSpec);
}
return mutator.finalize();
},
newChannel2() { throw Cr.NS_ERROR_NOT_IMPLEMENTED; },
newChannel() { throw Cr.NS_ERROR_NOT_IMPLEMENTED; },
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIProtocolHandler
])
};
var testProtocols = [
// It doesn't matter if it has this flag - the only flag we accept is
// URI_IS_LOCAL_RESOURCE.
{scheme: "moz-protocol-ui-resource",
--- a/devtools/client/webconsole/test/mochitest/browser_webconsole_network_requests_from_chrome.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_network_requests_from_chrome.js
@@ -9,17 +9,17 @@
"use strict";
const TEST_URI = "http://example.com/";
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" &&
subject.sourceName.includes("webconsole")) {
good = false;
}
}
};
--- a/devtools/client/webconsole/test/mochitest/browser_webconsole_observer_notifications.js
+++ b/devtools/client/webconsole/test/mochitest/browser_webconsole_observer_notifications.js
@@ -19,17 +19,17 @@ add_task(async function() {
await closeTabAndToolbox(gBrowser.selectedTab);
await waitFor(() => destroyed);
});
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);
switch (topic) {
case "web-console-created":
ok(HUDService.getHudReferenceById(subject.data), "We have a hud reference");
Services.obs.removeObserver(observer, "web-console-created");
--- a/devtools/startup/aboutdebugging-registration.js
+++ b/devtools/startup/aboutdebugging-registration.js
@@ -16,17 +16,17 @@ const { nsIAboutModule } = Ci;
function AboutDebugging() {}
AboutDebugging.prototype = {
uri: Services.io.newURI("chrome://devtools/content/aboutdebugging/aboutdebugging.xhtml"),
classDescription: "about:debugging",
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(
this.uri,
loadInfo
);
chan.owner = Services.scriptSecurityManager.getSystemPrincipal();
return chan;
--- a/devtools/startup/aboutdevtools/aboutdevtools-registration.js
+++ b/devtools/startup/aboutdevtools/aboutdevtools-registration.js
@@ -14,17 +14,17 @@ const { nsIAboutModule } = Ci;
function AboutDevtools() {}
AboutDevtools.prototype = {
uri: Services.io.newURI("chrome://devtools-startup/content/aboutdevtools/aboutdevtools.xhtml"),
classDescription: "about:devtools",
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(
this.uri,
loadInfo
);
chan.owner = Services.scriptSecurityManager.getSystemPrincipal();
return chan;
--- a/devtools/startup/aboutdevtoolstoolbox-registration.js
+++ b/devtools/startup/aboutdevtoolstoolbox-registration.js
@@ -15,17 +15,17 @@ const { nsIAboutModule } = Ci;
function AboutDevtoolsToolbox() {}
AboutDevtoolsToolbox.prototype = {
uri: Services.io.newURI("chrome://devtools/content/framework/toolbox.xul"),
classDescription: "about:devtools-toolbox",
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);
chan.owner = Services.scriptSecurityManager.getSystemPrincipal();
return chan;
},
getURIFlags: function(uri) {
--- a/docshell/test/browser/browser_bug655270.js
+++ b/docshell/test/browser/browser_bug655270.js
@@ -48,13 +48,13 @@ function test() {
onBeginUpdateBatch: function() { },
onEndUpdateBatch: function() { },
onVisits: function() { },
onTitleChanged: function() { },
onDeleteURI: function() { },
onClearHistory: function() { },
onDeleteVisits: function() { },
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver])
};
PlacesUtils.history.addObserver(observer);
}
--- a/docshell/test/browser/browser_bug670318.js
+++ b/docshell/test/browser/browser_bug670318.js
@@ -46,18 +46,18 @@ add_task(async function test() {
OnHistoryReplaceEntry: () => {
// The initial load of about:blank causes a transient entry to be
// created, so our first navigation to a real page is a replace
// instead of a new entry.
++count;
return true;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISHistoryListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISHistoryListener,
+ Ci.nsISupportsWeakReference])
};
history.legacySHistory.addSHistoryListener(listener);
// Since listener implements nsISupportsWeakReference, we are
// responsible for keeping it alive so that the GC doesn't clear
// it before the test completes. We do this by anchoring the listener
// to the content global window, and clearing it just before the test
// completes.
--- a/docshell/test/browser/browser_onbeforeunload_navigation.js
+++ b/docshell/test/browser/browser_onbeforeunload_navigation.js
@@ -150,17 +150,17 @@ var tabStateListener = {
if ((stateFlags & startDocumentFlags) == startDocumentFlags) {
loadStarted = true;
}
},
onStatusChange: () => {},
onLocationChange: () => {},
onSecurityChange: () => {},
onProgressChange: () => {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener])
};
function onTabModalDialogLoaded(node) {
let mm = testTab.linkedBrowser.messageManager;
mm.sendAsyncMessage("test-beforeunload:dialog");
if (gMultiProcessBrowser) {
// In non-e10s, onTabModalDialogLoaded fires synchronously while
--- a/docshell/test/browser/file_bug1328501_framescript.js
+++ b/docshell/test/browser/file_bug1328501_framescript.js
@@ -9,17 +9,17 @@ let requestObserver = {
// content viewers being created.
getChildDocShells().map(ds => {
let window = ds.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsILoadContext)
.associatedWindow;
});
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver
])
}
Services.obs.addObserver(requestObserver, "http-on-opening-request");
addEventListener("unload", e => {
if (e.target == this) {
Services.obs.removeObserver(requestObserver, "http-on-opening-request");
}
--- a/docshell/test/browser/file_bug422543_script.js
+++ b/docshell/test/browser/file_bug422543_script.js
@@ -33,18 +33,18 @@ SHistoryListener.prototype = {
OnHistoryReload: function (aReloadURI, aReloadFlags) {
this.last = "reload";
return this.retval;
},
OnHistoryReplaceEntry: function (aIndex) {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISHistoryListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISHistoryListener,
+ Ci.nsISupportsWeakReference])
};
let testAPI = {
shistory: null,
listeners: [ new SHistoryListener(),
new SHistoryListener() ],
init() {
--- a/docshell/test/chrome/test_bug909218.html
+++ b/docshell/test/chrome/test_bug909218.html
@@ -104,17 +104,17 @@ RequestWatcher = {
is(req.loadFlags & TEST_FLAGS, TEST_FLAGS, "request " + req.name + " has the expected flags");
this.requestCounts[req.name] += 1;
var stopFlags = Ci.nsIWebProgressListener.STATE_STOP |
Ci.nsIWebProgressListener.STATE_IS_DOCUMENT;
if (req.name == TEST_URL && (flags & stopFlags) == stopFlags) {
this.finalize();
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
])
}
function docshellForWindow(win) {
return win.
QueryInterface(Ci.nsIInterfaceRequestor).
--- a/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
+++ b/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xul
@@ -54,18 +54,18 @@ https://bugzilla.mozilla.org/show_bug.cg
reject("no network error message found in URI")
return;
}
var errorMsg = matchArray[1];
resolve(decodeURIComponent(errorMsg));
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference])
};
frame.contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebProgress)
.addProgressListener(progressListener,
Ci.nsIWebProgress.NOTIFY_LOCATION |
--- a/dom/base/DOMRequestHelper.jsm
+++ b/dom/base/DOMRequestHelper.jsm
@@ -37,18 +37,18 @@ function DOMRequestIpcHelper() {
this._window = null;
}
DOMRequestIpcHelper.prototype = {
/**
* An object which "inherits" from DOMRequestIpcHelper and declares its own
* queryInterface method MUST implement Ci.nsISupportsWeakReference.
*/
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
- Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference,
+ Ci.nsIObserver]),
/**
* 'aMessages' is expected to be an array of either:
* - objects of this form:
* {
* name: "messageName",
* weakRef: false
* }
--- a/dom/base/ProcessSelector.js
+++ b/dom/base/ProcessSelector.js
@@ -7,17 +7,17 @@ ChromeUtils.import('resource://gre/modul
// Fills up aProcesses until max and then selects randomly from the available
// ones.
function RandomSelector() {
}
RandomSelector.prototype = {
classID: Components.ID("{c616fcfd-9737-41f1-aa74-cee72a38f91b}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentProcessProvider]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentProcessProvider]),
provideProcess(aType, aOpener, aProcesses, aCount, aMaxCount) {
if (aCount < aMaxCount) {
return Ci.nsIContentProcessProvider.NEW_PROCESS;
}
let startIdx = Math.floor(Math.random() * aMaxCount);
let curIdx = startIdx;
@@ -36,17 +36,17 @@ RandomSelector.prototype = {
// Fills up aProcesses until max and then selects one from the available
// ones that host the least number of tabs.
function MinTabSelector() {
}
MinTabSelector.prototype = {
classID: Components.ID("{2dc08eaf-6eef-4394-b1df-a3a927c1290b}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentProcessProvider]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentProcessProvider]),
provideProcess(aType, aOpener, aProcesses, aCount, aMaxCount) {
if (aCount < aMaxCount) {
return Ci.nsIContentProcessProvider.NEW_PROCESS;
}
let min = Number.MAX_VALUE;
let candidate = Ci.nsIContentProcessProvider.NEW_PROCESS;
--- a/dom/base/SlowScriptDebug.js
+++ b/dom/base/SlowScriptDebug.js
@@ -7,17 +7,17 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function SlowScriptDebug() { }
SlowScriptDebug.prototype = {
classID: Components.ID("{e740ddb4-18b4-4aac-8ae1-9b0f4320769d}"),
classDescription: "Slow script debug handler",
contractID: "@mozilla.org/dom/slow-script-debug;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISlowScriptDebug]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISlowScriptDebug]),
get activationHandler() { return this._activationHandler; },
set activationHandler(cb) { return this._activationHandler = cb; },
get remoteActivationHandler() { return this._remoteActivationHandler; },
set remoteActivationHandler(cb) { return this._remoteActivationHandler = cb; },
};
--- a/dom/base/contentAreaDropListener.js
+++ b/dom/base/contentAreaDropListener.js
@@ -13,17 +13,17 @@ ChromeUtils.import("resource://gre/modul
// access the uri. This prevents, for example, a source document from tricking
// the user into dragging a chrome url.
function ContentAreaDropListener() { };
ContentAreaDropListener.prototype =
{
classID: Components.ID("{1f34bc80-1bc7-11d6-a384-d705dd0746fc}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDroppedLinkHandler, Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDroppedLinkHandler]),
_addLink : function(links, url, name, type)
{
links.push({ url, name, type });
},
_addLinksFromItem: function(links, dt, i)
{
--- a/dom/base/test/browser_bug1303838.js
+++ b/dom/base/test/browser_bug1303838.js
@@ -161,14 +161,14 @@ function waitForLocationChange(browser,
locationChangeListener = {
onLocationChange(aWebProgress, aRequest, aLocation, aFlags) {
info("LocationChange: " + aLocation.spec);
if (++seen == locationChangeNum) {
browser.removeProgressListener(this);
resolve();
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference])
};
browser.addProgressListener(locationChangeListener);
});
}
--- a/dom/base/test/browser_promiseDocumentFlushed.js
+++ b/dom/base/test/browser_promiseDocumentFlushed.js
@@ -116,18 +116,18 @@ add_task(async function test_can_get_res
assertFlushesRequired();
let rect = await window.promiseDocumentFlushed(() => {
let observer = {
reflow() {
Assert.ok(false, "A reflow should not have occurred.");
},
reflowInterruptible() {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIReflowObserver,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIReflowObserver,
+ Ci.nsISupportsWeakReference])
};
let docShell = window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShell);
docShell.addWeakReflowObserver(observer);
let toolboxRect = gNavToolbox.getBoundingClientRect();
--- a/dom/base/test/chrome/file_bug549682.xul
+++ b/dom/base/test/chrome/file_bug549682.xul
@@ -87,33 +87,33 @@ https://bugzilla.mozilla.org/show_bug.cg
function localL(m) {
is(m.name, "lasync", "Wrong message!");
is(m.json.data, 2345, "Wrong data!");
didRunLocal = true;
}
var weakMessageReceived = false;
var weakListener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference]),
receiveMessage: function(msg) {
if (weakMessageReceived) {
ok(false, 'Weak listener fired twice.');
return;
}
ok(true, 'Weak listener fired once.');
weakMessageReceived = true;
document.getElementById('ifr').messageManager
.removeWeakMessageListener('weak', weakListener);
}
};
var weakListener2 = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference]),
receiveMessage: function(msg) {
ok(false, 'Should not have received a message.');
}
};
function weakDoneListener() {
ok(weakMessageReceived, 'Got "weak" message.');
--- a/dom/base/test/chrome/test_bug682305.html
+++ b/dom/base/test/chrome/test_bug682305.html
@@ -88,17 +88,17 @@ CustomChannel.prototype = {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
suspend: function() {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
resume: function() {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel, Ci.nsIRequest])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannel, Ci.nsIRequest])
};
function CustomProtocol() {}
CustomProtocol.prototype = {
get scheme() {
return PROTOCOL_SCHEME;
},
@@ -120,19 +120,17 @@ CustomProtocol.prototype = {
.finalize();
},
newChannel2: function newChannel2(URI, loadInfo) {
return new CustomChannel(URI, loadInfo);
},
newChannel: function newChannel(URI) {
return newChannel2(URI);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsISupportsWeakReference,
- Ci.nsIProtocolHandler])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIProtocolHandler])
};
var gFactory = {
register: function() {
var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
var classID = Components.ID("{ed064287-1e76-49ba-a28d-dc74394a8334}");
var description = PROTOCOL_SCHEME + ": protocol";
--- a/dom/base/test/chrome/test_bug800386.xul
+++ b/dom/base/test/chrome/test_bug800386.xul
@@ -41,18 +41,17 @@ https://bugzilla.mozilla.org/show_bug.cg
return xhr2.getInterface(aIID);
} catch (e) {
forwardFailed = true;
}
}
throw Cr.NS_ERROR_NO_INTERFACE;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsIInterfaceRequestor])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor])
};
// HTTP URI so that we get progress callbacks
xhr.open("GET", "http://mochi.test:8888/", false);
xhr.channel.notificationCallbacks = requestor;
xhr.onreadystatechange = function() {
if (xhr.readyState == 4) {
ok(triedForwarding,
--- a/dom/bindings/test/TestInterfaceJS.js
+++ b/dom/bindings/test/TestInterfaceJS.js
@@ -8,19 +8,17 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
function TestInterfaceJS(anyArg, objectArg) {}
TestInterfaceJS.prototype = {
classID: Components.ID("{2ac4e026-cf25-47d5-b067-78d553c3cad8}"),
contractID: "@mozilla.org/dom/test-interface-js;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsIDOMGlobalPropertyInitializer,
- Ci.mozITestInterfaceJS]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer, Ci.mozITestInterfaceJS]),
init: function(win) { this._win = win; },
__init: function (anyArg, objectArg, dictionaryArg) {
this._anyAttr = undefined;
this._objectAttr = null;
this._anyArg = anyArg;
this._objectArg = objectArg;
--- a/dom/bindings/test/TestInterfaceJSMaplike.js
+++ b/dom/bindings/test/TestInterfaceJSMaplike.js
@@ -8,18 +8,17 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
function TestInterfaceJSMaplike() {}
TestInterfaceJSMaplike.prototype = {
classID: Components.ID("{4bc6f6f3-e005-4f0a-b42d-4d1663a9013a}"),
contractID: "@mozilla.org/dom/test-interface-js-maplike;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsIDOMGlobalPropertyInitializer]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer]),
init: function(win) { this._win = win; },
__init: function () {},
setInternal: function(aKey, aValue) {
return this.__DOM_IMPL__.__set(aKey, aValue);
},
--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@@ -118,18 +118,18 @@ function BrowserElementChild() {
this._isContentWindowCreated = false;
this._init();
};
BrowserElementChild.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
_init: function() {
debug("Starting up.");
BrowserElementPromptService.mapWindowToBrowserElementChild(content, this);
docShell.QueryInterface(Ci.nsIWebProgress)
.addProgressListener(this._progressListener,
@@ -1375,18 +1375,18 @@ BrowserElementChild.prototype = {
}
this._finder.removeSelection();
sendAsyncMsg("findchange", {active: false});
},
// The docShell keeps a weak reference to the progress listener, so we need
// to keep a strong ref to it ourselves.
_progressListener: {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference]),
_seenLoadStart: false,
onLocationChange: function(webProgress, request, location, flags) {
// We get progress events from subshells here, which is kind of weird.
if (webProgress != docShell) {
return;
}
--- a/dom/browser-element/BrowserElementParent.js
+++ b/dom/browser-element/BrowserElementParent.js
@@ -69,19 +69,19 @@ function BrowserElementParent() {
Services.obs.addObserver(this, 'back-docommand', /* ownsWeak = */ true);
}
BrowserElementParent.prototype = {
classDescription: "BrowserElementAPI implementation",
classID: Components.ID("{9f171ac4-0939-4ef8-b360-3408aedc3060}"),
contractID: "@mozilla.org/dom/browser-element-api;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIBrowserElementAPI,
- Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIBrowserElementAPI,
+ Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
setFrameLoader: function(frameLoader) {
debug("Setting frameLoader");
this._frameLoader = frameLoader;
this._frameElement = frameLoader.ownerElement;
if (!this._frameElement) {
debug("No frame element?");
return;
@@ -723,18 +723,18 @@ BrowserElementParent.prototype = {
this.extListener.onStopRequest(aRequest, aContext, aStatusCode);
}
},
onDataAvailable: function(aRequest, aContext, aInputStream,
aOffset, aCount) {
this.extListener.onDataAvailable(aRequest, aContext, aInputStream,
aOffset, aCount);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener,
- Ci.nsIRequestObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamListener,
+ Ci.nsIRequestObserver])
};
let referrer = Services.io.newURI(_options.referrer);
let principal =
Services.scriptSecurityManager.createCodebasePrincipal(
referrer, this._frameLoader.loadContext.originAttributes);
let channel = NetUtil.newChannel({
--- a/dom/browser-element/BrowserElementPromptService.jsm
+++ b/dom/browser-element/BrowserElementPromptService.jsm
@@ -20,17 +20,17 @@ function debug(msg) {
}
function BrowserElementPrompt(win, browserElementChild) {
this._win = win;
this._browserElementChild = browserElementChild;
}
BrowserElementPrompt.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt]),
alert: function(title, text) {
this._browserElementChild.showModalPrompt(
this._win, {promptType: "alert", title: title, message: text, returnValue: undefined});
},
alertCheck: function(title, text, checkMsg, checkState) {
// Treat this like a normal alert() call, ignoring the checkState. The
@@ -207,17 +207,17 @@ BrowserElementPrompt.prototype = {
},
};
function BrowserElementAuthPrompt() {
}
BrowserElementAuthPrompt.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAuthPrompt2]),
promptAuth: function promptAuth(channel, level, authInfo) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
asyncPromptAuth: function asyncPromptAuth(channel, callback, context, level, authInfo) {
debug("asyncPromptAuth");
@@ -237,17 +237,17 @@ BrowserElementAuthPrompt.prototype = {
BrowserElementPromptService.getBrowserElementParentForFrame(frame);
if (!browserElementParent) {
debug("Failed to load browser element parent.");
throw Cr.NS_ERROR_FAILURE;
}
let consumer = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
callback: callback,
context: context,
cancel: function() {
this.callback.onAuthCancelled(this.context, false);
this.callback = null;
this.context = null;
}
};
@@ -436,17 +436,17 @@ BrowserElementAuthPrompt.prototype = {
function AuthPromptWrapper(oldImpl, browserElementImpl) {
this._oldImpl = oldImpl;
this._browserElementImpl = browserElementImpl;
}
AuthPromptWrapper.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAuthPrompt2]),
promptAuth: function(channel, level, authInfo) {
if (this._canGetParentElement(channel)) {
return this._browserElementImpl.promptAuth(channel, level, authInfo);
} else {
return this._oldImpl.promptAuth(channel, level, authInfo);
}
},
@@ -478,17 +478,17 @@ AuthPromptWrapper.prototype = {
};
function BrowserElementPromptFactory(toWrap) {
this._wrapped = toWrap;
}
BrowserElementPromptFactory.prototype = {
classID: Components.ID("{24f3d0cf-e417-4b85-9017-c9ecf8bb1299}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptFactory]),
_mayUseNativePrompt: function() {
try {
return Services.prefs.getBoolPref("browser.prompt.allowNative");
} catch (e) {
// This properity is default to true.
return true;
}
@@ -558,18 +558,18 @@ BrowserElementPromptFactory.prototype =
debug("Returning wrapped getPrompt for " + win);
return new BrowserElementPrompt(win, browserElementChild)
.QueryInterface(iid);
}
};
var BrowserElementPromptService = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
_initialized: false,
_init: function() {
if (this._initialized) {
return;
}
--- a/dom/console/ConsoleAPIStorage.js
+++ b/dom/console/ConsoleAPIStorage.js
@@ -39,18 +39,18 @@ const CONSOLEAPISTORAGE_CID = Components
* ConsoleAPIStorage.clearEvents(innerWindowID);
*/
function ConsoleAPIStorageService() {
this.init();
}
ConsoleAPIStorageService.prototype = {
classID : CONSOLEAPISTORAGE_CID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIConsoleAPIStorage,
- Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIConsoleAPIStorage,
+ Ci.nsIObserver]),
classInfo: XPCOMUtils.generateCI({
classID: CONSOLEAPISTORAGE_CID,
contractID: '@mozilla.org/consoleAPI-storage;1',
interfaces: [Ci.nsIConsoleAPIStorage, Ci.nsIObserver],
flags: Ci.nsIClassInfo.SINGLETON
}),
observe: function CS_observe(aSubject, aTopic, aData)
--- a/dom/html/htmlMenuBuilder.js
+++ b/dom/html/htmlMenuBuilder.js
@@ -25,17 +25,17 @@ function HTMLMenuBuilder() {
// other UI from this object. The default UI is done in PageMenu.jsm.
//
// When a multi-process browser is used, the first step is performed by the child
// process and the second step is performed by the parent process.
HTMLMenuBuilder.prototype =
{
classID: Components.ID("{51c65f5d-0de5-4edc-9058-60e50cef77f8}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIMenuBuilder]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIMenuBuilder]),
currentNode: null,
root: null,
items: {},
nestedStack: [],
toJSONString: function() {
return JSON.stringify(this.root);
--- a/dom/html/test/head.js
+++ b/dom/html/test/head.js
@@ -33,18 +33,18 @@ function waitForDocLoadComplete(aBrowser
if ((flags & docStop) == docStop && status != Cr.NS_BINDING_ABORTED) {
aBrowser.removeProgressListener(this);
waitForDocLoadComplete.listeners.delete(this);
let chan = req.QueryInterface(Ci.nsIChannel);
info("Browser loaded " + chan.originalURI.spec);
resolve();
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference])
};
aBrowser.addProgressListener(listener);
waitForDocLoadComplete.listeners.add(listener);
info("Waiting for browser load");
});
}
// Keep a set of progress listeners for waitForDocLoadComplete() to make sure
// they're not GC'ed before we saw the page load.
--- a/dom/indexedDB/test/unit/GlobalObjectsComponent.js
+++ b/dom/indexedDB/test/unit/GlobalObjectsComponent.js
@@ -9,17 +9,17 @@ Cu.importGlobalProperties(["indexedDB"])
function GlobalObjectsComponent() {
this.wrappedJSObject = this;
}
GlobalObjectsComponent.prototype =
{
classID: Components.ID("{949ebf50-e0da-44b9-8335-cbfd4febfdcc}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([]),
runTest() {
const name = "Splendid Test";
let ok = this.ok;
let finishTest = this.finishTest;
let keyRange = IDBKeyRange.only(42);
--- a/dom/media/IdpSandbox.jsm
+++ b/dom/media/IdpSandbox.jsm
@@ -18,17 +18,17 @@ RedirectHttpsOnly.prototype = {
} else {
callback.onRedirectVerifyCallback(Cr.NS_OK);
}
},
getInterface(iid) {
return this.QueryInterface(iid);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannelEventSink])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannelEventSink])
};
/** This class loads a resource into a single string. ResourceLoader.load() is
* the entry point. */
function ResourceLoader(res, rej) {
this.resolve = res;
this.reject = rej;
this.data = "";
@@ -72,17 +72,17 @@ ResourceLoader.prototype = {
} else {
this.reject(new Error("Load failed: " + status));
}
},
getInterface(iid) {
return this.QueryInterface(iid);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamListener])
};
/**
* A simple implementation of the WorkerLocation interface.
*/
function createLocationFromURI(uri) {
return {
href: uri.spec,
--- a/dom/media/PeerConnection.js
+++ b/dom/media/PeerConnection.js
@@ -198,18 +198,18 @@ class GlobalPCList {
}
}
_registerPeerConnectionLifecycleCallback(winID, cb) {
this._lifecycleobservers[winID] = cb;
}
}
setupPrototype(GlobalPCList, {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
classID: PC_MANAGER_CID,
_xpcom_factory: {
createInstance(outer, iid) {
if (outer) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return _globalPCList.QueryInterface(iid);
}
@@ -225,18 +225,17 @@ class RTCIceCandidate {
__init(dict) {
Object.assign(this, dict);
}
}
setupPrototype(RTCIceCandidate, {
classID: PC_ICE_CID,
contractID: PC_ICE_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsIDOMGlobalPropertyInitializer])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer])
});
class RTCSessionDescription {
init(win) {
this._win = win;
this._winID = this._win.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
}
@@ -270,18 +269,17 @@ class RTCSessionDescription {
let err = this._win.Error();
logMsg(msg, err.fileName, err.lineNumber, Ci.nsIScriptError.warningFlag,
this._winID);
}
}
setupPrototype(RTCSessionDescription, {
classID: PC_SESSION_CID,
contractID: PC_SESSION_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsIDOMGlobalPropertyInitializer])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer])
});
class RTCStatsReport {
constructor(win, dict) {
this._win = win;
this._pcid = dict.pcid;
this._report = convertToRTCStatsReport(dict);
}
@@ -325,17 +323,17 @@ class RTCStatsReport {
__onget(key, value) {
/* Do whatever here */
}
}
setupPrototype(RTCStatsReport, {
classID: PC_STATS_CID,
contractID: PC_STATS_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([]),
_specToLegacyFieldMapping: {
"inbound-rtp": "inboundrtp",
"outbound-rtp": "outboundrtp",
"candidate-pair": "candidatepair",
"local-candidate": "localcandidate",
"remote-candidate": "remotecandidate"
}
});
@@ -1601,18 +1599,17 @@ class RTCPeerConnection {
this.updateNegotiationNeeded();
return dataChannel;
}
}
setupPrototype(RTCPeerConnection, {
classID: PC_CID,
contractID: PC_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsIDOMGlobalPropertyInitializer]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer]),
_actions: {
offer: Ci.IPeerConnection.kActionOffer,
answer: Ci.IPeerConnection.kActionAnswer,
pranswer: Ci.IPeerConnection.kActionPRAnswer,
rollback: Ci.IPeerConnection.kActionRollback,
},
});
@@ -1860,35 +1857,33 @@ class PeerConnectionObserver {
syncTransceivers() {
this._dompc._syncTransceivers();
}
}
setupPrototype(PeerConnectionObserver, {
classID: PC_OBS_CID,
contractID: PC_OBS_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsIDOMGlobalPropertyInitializer])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer])
});
class RTCPeerConnectionStatic {
init(win) {
this._winID = win.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
}
registerPeerConnectionLifecycleCallback(cb) {
_globalPCList._registerPeerConnectionLifecycleCallback(this._winID, cb);
}
}
setupPrototype(RTCPeerConnectionStatic, {
classID: PC_STATIC_CID,
contractID: PC_STATIC_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsIDOMGlobalPropertyInitializer])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer])
});
class RTCDTMFSender {
constructor(sender) {
this._sender = sender;
}
get toneBuffer() {
@@ -1906,17 +1901,17 @@ class RTCDTMFSender {
insertDTMF(tones, duration, interToneGap) {
this._sender._pc._checkClosed();
this._sender._transceiver.insertDTMF(tones, duration, interToneGap);
}
}
setupPrototype(RTCDTMFSender, {
classID: PC_DTMF_SENDER_CID,
contractID: PC_DTMF_SENDER_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports])
+ QueryInterface: ChromeUtils.generateQI([])
});
class RTCRtpSender {
constructor(pc, transceiverImpl, transceiver, track, kind, streams) {
let dtmf = null;
if (kind == "audio") {
dtmf = pc._win.RTCDTMFSender._create(pc._win, new RTCDTMFSender(this));
}
@@ -2048,17 +2043,17 @@ class RTCRtpSender {
"This sender was not created by this PeerConnection",
"InvalidAccessError");
}
}
}
setupPrototype(RTCRtpSender, {
classID: PC_SENDER_CID,
contractID: PC_SENDER_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports])
+ QueryInterface: ChromeUtils.generateQI([])
});
class RTCRtpReceiver {
constructor(pc, transceiverImpl) {
// We do not set the track here; that is done when _transceiverImpl is set
Object.assign(this,
{
_pc: pc,
@@ -2218,17 +2213,17 @@ class RTCRtpReceiver {
{ track: this.track });
trackEvents.push(ev);
}
}
}
setupPrototype(RTCRtpReceiver, {
classID: PC_RECEIVER_CID,
contractID: PC_RECEIVER_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports])
+ QueryInterface: ChromeUtils.generateQI([])
});
class RTCRtpTransceiver {
constructor(pc, transceiverImpl, init, kind, sendTrack) {
let receiver = pc._win.RTCRtpReceiver._create(
pc._win, new RTCRtpReceiver(pc, transceiverImpl, kind));
let streams = (init && init.streams) || [];
let sender = pc._win.RTCRtpSender._create(
@@ -2381,28 +2376,28 @@ class RTCRtpTransceiver {
// extra hops through RTCPeerConnection and PeerConnectionImpl
this._pc._insertDTMF(this._transceiverImpl, tones, duration, interToneGap);
}
}
setupPrototype(RTCRtpTransceiver, {
classID: PC_TRANSCEIVER_CID,
contractID: PC_TRANSCEIVER_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports])
+ QueryInterface: ChromeUtils.generateQI([])
});
class CreateOfferRequest {
constructor(windowID, innerWindowID, callID, isSecure) {
Object.assign(this, { windowID, innerWindowID, callID, isSecure });
}
}
setupPrototype(CreateOfferRequest, {
classID: PC_COREQUEST_CID,
contractID: PC_COREQUEST_CONTRACT,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports])
+ QueryInterface: ChromeUtils.generateQI([])
});
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(
[GlobalPCList,
RTCDTMFSender,
RTCIceCandidate,
RTCSessionDescription,
RTCPeerConnection,
--- a/dom/media/webvtt/WebVTTParserWrapper.js
+++ b/dom/media/webvtt/WebVTTParserWrapper.js
@@ -54,17 +54,17 @@ WebVTTParserWrapper.prototype =
processCues: function(window, cues, overlay, controls)
{
WebVTT.processCues(window, cues, overlay, controls);
},
classDescription: "Wrapper for the JS WebVTT implementation (vtt.js)",
classID: Components.ID(WEBVTTPARSERWRAPPER_CID),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebVTTParserWrapper]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebVTTParserWrapper]),
classInfo: XPCOMUtils.generateCI({
classID: WEBVTTPARSERWRAPPER_CID,
contractID: WEBVTTPARSERWRAPPER_CONTRACTID,
interfaces: [Ci.nsIWebVTTParserWrapper]
})
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([WebVTTParserWrapper]);
--- a/dom/notification/NotificationStorage.js
+++ b/dom/notification/NotificationStorage.js
@@ -251,13 +251,13 @@ NotificationStorage.prototype = {
this._byTag[origin][tag] = notification;
}
});
this._cached = true;
},
classID : Components.ID(NOTIFICATIONSTORAGE_CID),
contractID : NOTIFICATIONSTORAGE_CONTRACTID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINotificationStorage]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINotificationStorage]),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([NotificationStorage]);
--- a/dom/payments/test/BasiccardChromeScript.js
+++ b/dom/payments/test/BasiccardChromeScript.js
@@ -69,17 +69,17 @@ const detailedResponseUI = {
"", // payer email
""); // payer phone
paymentSrv.respondPayment(showResponse.QueryInterface(Ci.nsIPaymentActionResponse));
},
abortPayment: abortPaymentResponse,
completePayment: completePaymentResponse,
updatePayment: function(requestId) {
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
};
const simpleResponseUI = {
showPayment: function(requestId) {
try {
basiccardResponseData.initData("", // cardholderName
"4916855166538720", // cardNumber
"", // expiryMonth
@@ -97,17 +97,17 @@ const simpleResponseUI = {
"", // payer email
""); // payer phone
paymentSrv.respondPayment(showResponse.QueryInterface(Ci.nsIPaymentActionResponse));
},
abortPayment: abortPaymentResponse,
completePayment: completePaymentResponse,
updatePayment: function(requestId) {
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
};
addMessageListener("set-detailed-ui-service", function() {
paymentSrv.setTestingUIService(detailedResponseUI.QueryInterface(Ci.nsIPaymentUIService));
});
addMessageListener("set-simple-ui-service", function() {
paymentSrv.setTestingUIService(simpleResponseUI.QueryInterface(Ci.nsIPaymentUIService));
--- a/dom/payments/test/CurrencyAmountValidationChromeScript.js
+++ b/dom/payments/test/CurrencyAmountValidationChromeScript.js
@@ -16,17 +16,17 @@ const InvalidDetailsUIService = {
createInstance(Ci.nsIPaymentAbortActionResponse);
abortResponse.init(requestId, Ci.nsIPaymentActionResponse.ABORT_SUCCEEDED);
paymentSrv.respondPayment(abortResponse.QueryInterface(Ci.nsIPaymentActionResponse));
},
completePayment: function(requestId) {
},
updatePayment: function(requestId) {
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
};
function emitTestFail(message) {
sendAsyncMessage("test-fail", message);
}
function checkLowerCaseCurrency() {
--- a/dom/payments/test/PMIValidationChromeScript.js
+++ b/dom/payments/test/PMIValidationChromeScript.js
@@ -34,17 +34,17 @@ const UIService = {
Ci.nsIPaymentActionResponse.PAYMENT_ACCEPTED,
"https://example.com", // payment method
showResponseData, // payment method data
"Bill A. Pacheco", // payer name
"", // payer email
""); // payer phone
paymentSrv.respondPayment(showResponse.QueryInterface(Ci.nsIPaymentActionResponse));
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
};
function emitTestFail(message) {
sendAsyncMessage("test-fail", message);
}
addMessageListener("set-ui-service", function() {
paymentSrv.setTestingUIService(UIService.QueryInterface(Ci.nsIPaymentUIService));
--- a/dom/payments/test/RequestShippingChromeScript.js
+++ b/dom/payments/test/RequestShippingChromeScript.js
@@ -66,17 +66,17 @@ const NormalUIService = {
Ci.nsIPaymentActionResponse.PAYMENT_ACCEPTED,
"testing-payment-method", // payment method
showResponseData, // payment method data
"", // payer name
"", // payer email
""); // payer phone
paymentSrv.respondPayment(showResponse.QueryInterface(Ci.nsIPaymentActionResponse));
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
};
addMessageListener("set-normal-ui-service", function() {
paymentSrv.setTestingUIService(NormalUIService.QueryInterface(Ci.nsIPaymentUIService));
});
addMessageListener("teardown", function() {
paymentSrv.cleanup();
--- a/dom/payments/test/ShippingOptionsChromeScript.js
+++ b/dom/payments/test/ShippingOptionsChromeScript.js
@@ -69,17 +69,17 @@ const TestingUIService = {
completePayment: function(requestId) {
let request = paymentSrv.getPaymentRequestById(requestId);
let completeResponse = Cc["@mozilla.org/dom/payments/payment-complete-action-response;1"].
createInstance(Ci.nsIPaymentCompleteActionResponse);
completeResponse.init(requestId, Ci.nsIPaymentActionResponse.COMPLETE_SUCCEEDED);
paymentSrv.respondPayment(completeResponse.QueryInterface(Ci.nsIPaymentActionResponse));
},
updatePayment: updateRequest,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
};
paymentSrv.setTestingUIService(TestingUIService.QueryInterface(Ci.nsIPaymentUIService));
addMessageListener("set-expected-results", function(results) {
expectedRequestOption = results.requestResult;
expectedUpdatedOption = results.responseResult;
changeShippingOption = results.changeOptionResult;
--- a/dom/payments/test/ShowPaymentChromeScript.js
+++ b/dom/payments/test/ShowPaymentChromeScript.js
@@ -145,17 +145,17 @@ function updateRequest(requestId) {
}
}
const DummyUIService = {
showPayment: showRequest,
abortPayment: abortRequest,
completePayment: completeRequest,
updatePayment: updateRequest,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
};
paymentSrv.setTestingUIService(DummyUIService.QueryInterface(Ci.nsIPaymentUIService));
function testShowResponseInit() {
const showResponseData = Cc["@mozilla.org/dom/payments/general-response-data;1"].
createInstance(Ci.nsIGeneralResponseData);
try {
--- a/dom/presentation/PresentationDataChannelSessionTransport.js
+++ b/dom/presentation/PresentationDataChannelSessionTransport.js
@@ -18,17 +18,17 @@ const PRESENTATIONTRANSPORT_CONTRACTID =
const PRESENTATIONTRANSPORTBUILDER_CID = Components.ID("{215b2f62-46e2-4004-a3d1-6858e56c20f3}");
const PRESENTATIONTRANSPORTBUILDER_CONTRACTID = "mozilla.org/presentation/datachanneltransportbuilder;1";
function PresentationDataChannelDescription(aDataChannelSDP) {
this._dataChannelSDP = JSON.stringify(aDataChannelSDP);
}
PresentationDataChannelDescription.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationChannelDescription]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationChannelDescription]),
get type() {
return Ci.nsIPresentationChannelDescription.TYPE_DATACHANNEL;
},
get tcpAddress() {
return null;
},
get tcpPort() {
return null;
@@ -41,19 +41,19 @@ PresentationDataChannelDescription.proto
function PresentationTransportBuilder() {
log("PresentationTransportBuilder construct");
this._isControlChannelNeeded = true;
}
PresentationTransportBuilder.prototype = {
classID: PRESENTATIONTRANSPORTBUILDER_CID,
contractID: PRESENTATIONTRANSPORTBUILDER_CONTRACTID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransportBuilder,
- Ci.nsIPresentationDataChannelSessionTransportBuilder,
- Ci.nsITimerCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransportBuilder,
+ Ci.nsIPresentationDataChannelSessionTransportBuilder,
+ Ci.nsITimerCallback]),
buildDataChannelTransport: function(aRole, aWindow, aListener) {
if (!aRole || !aWindow || !aListener) {
log("buildDataChannelTransport with illegal parameters");
throw Cr.NS_ERROR_ILLEGAL_VALUE;
}
if (this._window) {
@@ -240,17 +240,17 @@ PresentationTransportBuilder.prototype =
function PresentationTransport() {
this._messageQueue = [];
this._closeReason = Cr.NS_OK;
}
PresentationTransport.prototype = {
classID: PRESENTATIONTRANSPORT_CID,
contractID: PRESENTATIONTRANSPORT_CONTRACTID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransport]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransport]),
init: function(aPeerConnection, aDataChannel, aWindow) {
log("initWithDataChannel");
this._enableDataNotification = false;
this._dataChannel = aDataChannel;
this._peerConnection = aPeerConnection;
this._window = aWindow;
--- a/dom/presentation/PresentationNetworkHelper.js
+++ b/dom/presentation/PresentationNetworkHelper.js
@@ -9,17 +9,17 @@ ChromeUtils.import("resource://gre/modul
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
const NETWORKHELPER_CID = Components.ID("{5fb96caa-6d49-4f6b-9a4b-65dd0d51f92d}");
function PresentationNetworkHelper() {}
PresentationNetworkHelper.prototype = {
classID: NETWORKHELPER_CID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationNetworkHelper]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationNetworkHelper]),
getWifiIPAddress: function(aListener) {
EventDispatcher.instance.sendRequestForResult({type: "Wifi:GetIPAddress"})
.then(result => aListener.onGetWifiIPAddress(result),
err => aListener.onError(err));
}
};
--- a/dom/presentation/provider/AndroidCastDeviceProvider.js
+++ b/dom/presentation/provider/AndroidCastDeviceProvider.js
@@ -255,17 +255,17 @@ LocalControlChannel.prototype = {
},
reconnect: function LCC_reconnect(aPresentationId, aUrl) {
log("1-UA on Android doesn't support reconnect.");
throw Cr.NS_ERROR_FAILURE;
},
classID: Components.ID("{c9be9450-e5c7-4294-a287-376971b017fd}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannel]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannel]),
};
function ChromecastRemoteDisplayDevice(aProvider, aId, aName, aRole) {
this._provider = aProvider;
this._id = aId;
this._name = aName;
this._role = aRole;
}
@@ -344,20 +344,20 @@ ChromecastRemoteDisplayDevice.prototype
+ aTopic + " data=" + aData);
if (this.windowId === aData) {
Services.obs.removeObserver(this, TOPIC_PRESENTATION_VIEW_READY);
this._ctrlChannel.notifyConnected();
}
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevice,
- Ci.nsIPresentationLocalDevice,
- Ci.nsISupportsWeakReference,
- Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevice,
+ Ci.nsIPresentationLocalDevice,
+ Ci.nsISupportsWeakReference,
+ Ci.nsIObserver]),
};
function AndroidCastDeviceProvider() {
this._listener = null;
this._deviceList = new Map();
}
AndroidCastDeviceProvider.prototype = {
@@ -458,13 +458,13 @@ AndroidCastDeviceProvider.prototype = {
this._listener.removeDevice(device);
this._deviceList.delete(deviceId);
break;
}
}
},
classID: Components.ID("{7394f24c-dbc3-48c8-8a47-cd10169b7c6b}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsIPresentationDeviceProvider]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsIPresentationDeviceProvider]),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([AndroidCastDeviceProvider]);
--- a/dom/presentation/provider/PresentationControlService.js
+++ b/dom/presentation/provider/PresentationControlService.js
@@ -353,19 +353,19 @@ PresentationControlService.prototype = {
this.startServer();
} catch (e) {
DEBUG && log("PresentationControlService - restart service fail: " + e); // jshint ignore:line
}
}
},
classID: Components.ID("{f4079b8b-ede5-4b90-a112-5b415a931deb}"),
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIServerSocketListener,
- Ci.nsIPresentationControlService,
- Ci.nsIObserver]),
+ QueryInterface : ChromeUtils.generateQI([Ci.nsIServerSocketListener,
+ Ci.nsIPresentationControlService,
+ Ci.nsIObserver]),
};
function ChannelDescription(aInit) {
this._type = aInit.type;
switch (this._type) {
case Ci.nsIPresentationChannelDescription.TYPE_TCP:
this._tcpAddresses = Cc["@mozilla.org/array;1"]
.createInstance(Ci.nsIMutableArray);
@@ -402,17 +402,17 @@ ChannelDescription.prototype = {
return this._tcpPort;
},
get dataChannelSDP() {
return this._dataChannelSDP;
},
classID: Components.ID("{82507aea-78a2-487e-904a-858a6c5bf4e1}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationChannelDescription]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationChannelDescription]),
};
// Helper function: transfer nsIPresentationChannelDescription to json
function discriptionAsJson(aDescription) {
let json = {};
json.type = aDescription.type;
switch(aDescription.type) {
case Ci.nsIPresentationChannelDescription.TYPE_TCP:
@@ -947,13 +947,13 @@ TCPControlChannel.prototype = {
this._onAnswer(answer);
},
notifyIceCandidate: function(candidate) {
this._listener.onIceCandidate(candidate);
},
classID: Components.ID("{fefb8286-0bdc-488b-98bf-0c11b485c955}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannel,
- Ci.nsIStreamListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannel,
+ Ci.nsIStreamListener]),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PresentationControlService]); // jshint ignore:line
--- a/dom/presentation/tests/mochitest/PresentationDeviceInfoChromeScript.js
+++ b/dom/presentation/tests/mochitest/PresentationDeviceInfoChromeScript.js
@@ -4,82 +4,82 @@
'use strict';
const { XPCOMUtils } = ChromeUtils.import('resource://gre/modules/XPCOMUtils.jsm');
const manager = Cc['@mozilla.org/presentation-device/manager;1']
.getService(Ci.nsIPresentationDeviceManager);
var testProvider = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceProvider]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceProvider]),
forceDiscovery: function() {
sendAsyncMessage('force-discovery');
},
listener: null,
};
var testDevice = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevice]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevice]),
establishControlChannel: function() {
return null;
},
disconnect: function() {},
isRequestedUrlSupported: function(requestedUrl) {
return true;
},
id: null,
name: null,
type: null,
listener: null,
};
var testDevice1 = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevice]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevice]),
id: 'dummyid',
name: 'dummyName',
type: 'dummyType',
establishControlChannel: function(url, presentationId) {
return null;
},
disconnect: function() {},
isRequestedUrlSupported: function(requestedUrl) {
return true;
},
};
var testDevice2 = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevice]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevice]),
id: 'dummyid',
name: 'dummyName',
type: 'dummyType',
establishControlChannel: function(url, presentationId) {
return null;
},
disconnect: function() {},
isRequestedUrlSupported: function(requestedUrl) {
return true;
},
};
var mockedDeviceWithoutSupportedURL = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevice]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevice]),
id: 'dummyid',
name: 'dummyName',
type: 'dummyType',
establishControlChannel: function(url, presentationId) {
return null;
},
disconnect: function() {},
isRequestedUrlSupported: function(requestedUrl) {
return false;
},
};
var mockedDeviceSupportHttpsURL = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevice]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevice]),
id: 'dummyid',
name: 'dummyName',
type: 'dummyType',
establishControlChannel: function(url, presentationId) {
return null;
},
disconnect: function() {},
isRequestedUrlSupported: function(requestedUrl) {
--- a/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js
+++ b/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js
@@ -49,30 +49,30 @@ var sessionId = 'test-session-id-' + uui
const address = Cc["@mozilla.org/supports-cstring;1"]
.createInstance(Ci.nsISupportsCString);
address.data = "127.0.0.1";
const addresses = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
addresses.appendElement(address);
const mockedChannelDescription = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationChannelDescription]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationChannelDescription]),
get type() {
if (Services.prefs.getBoolPref("dom.presentation.session_transport.data_channel.enable")) {
return Ci.nsIPresentationChannelDescription.TYPE_DATACHANNEL;
}
return Ci.nsIPresentationChannelDescription.TYPE_TCP;
},
tcpAddress: addresses,
tcpPort: 1234,
};
const mockedServerSocket = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIServerSocket,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIServerSocket,
+ Ci.nsIFactory]),
createInstance: function(aOuter, aIID) {
if (aOuter) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return this.QueryInterface(aIID);
},
get port() {
return this._port;
@@ -94,21 +94,21 @@ const mockedServerSocket = {
this._listener.onStopListening(this, Cr.NS_BINDING_ABORTED);
},
simulateOnSocketAccepted: function(serverSocket, socketTransport) {
this._listener.onSocketAccepted(serverSocket, socketTransport);
}
};
const mockedSocketTransport = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISocketTransport]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISocketTransport]),
};
const mockedControlChannel = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannel]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannel]),
set listener(listener) {
this._listener = listener;
},
get listener() {
return this._listener;
},
sendOffer: function(offer) {
sendAsyncMessage('offer-sent', this._isValidSDP(offer));
@@ -172,33 +172,33 @@ const mockedControlChannel = {
},
simulateNotifyConnected: function() {
sendAsyncMessage('control-channel-opened');
this._listener.QueryInterface(Ci.nsIPresentationControlChannelListener).notifyConnected();
},
};
const mockedDevice = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevice]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevice]),
id: 'id',
name: 'name',
type: 'type',
establishControlChannel: function(url, presentationId) {
sendAsyncMessage('control-channel-established');
return mockedControlChannel;
},
disconnect: function() {},
isRequestedUrlSupported: function(requestedUrl) {
return true;
},
};
const mockedDevicePrompt = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevicePrompt,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevicePrompt,
+ Ci.nsIFactory]),
createInstance: function(aOuter, aIID) {
if (aOuter) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return this.QueryInterface(aIID);
},
set request(request) {
this._request = request;
@@ -214,22 +214,22 @@ const mockedDevicePrompt = {
this._request.select(mockedDevice);
},
simulateCancel: function(result) {
this._request.cancel(result);
}
};
const mockedSessionTransport = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransport,
- Ci.nsIPresentationSessionTransportBuilder,
- Ci.nsIPresentationTCPSessionTransportBuilder,
- Ci.nsIPresentationDataChannelSessionTransportBuilder,
- Ci.nsIPresentationControlChannelListener,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransport,
+ Ci.nsIPresentationSessionTransportBuilder,
+ Ci.nsIPresentationTCPSessionTransportBuilder,
+ Ci.nsIPresentationDataChannelSessionTransportBuilder,
+ Ci.nsIPresentationControlChannelListener,
+ Ci.nsIFactory]),
createInstance: function(aOuter, aIID) {
if (aOuter) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return this.QueryInterface(aIID);
},
set callback(callback) {
this._callback = callback;
@@ -252,17 +252,17 @@ const mockedSessionTransport = {
}, 0);
},
buildTCPReceiverTransport: function(description, listener) {
this._listener = listener;
this._role = Ci.nsIPresentationService.ROLE_RECEIVER;
var addresses = description.QueryInterface(Ci.nsIPresentationChannelDescription).tcpAddress;
this._selfAddress = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINetAddr]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINetAddr]),
address: (addresses.length > 0) ?
addresses.queryElementAt(0, Ci.nsISupportsCString).data : "",
port: description.QueryInterface(Ci.nsIPresentationChannelDescription).tcpPort,
};
setTimeout(()=>{
this._listener.onSessionTransport(this);
this._listener = null;
@@ -303,43 +303,43 @@ const mockedSessionTransport = {
},
onOffer: function(aOffer) {
},
onAnswer: function(aAnswer) {
}
};
const mockedNetworkInfo = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINetworkInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINetworkInfo]),
getAddresses: function(ips, prefixLengths) {
ips.value = ["127.0.0.1"];
prefixLengths.value = [0];
return 1;
},
};
const mockedNetworkManager = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINetworkManager,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINetworkManager,
+ Ci.nsIFactory]),
createInstance: function(aOuter, aIID) {
if (aOuter) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return this.QueryInterface(aIID);
},
get activeNetworkInfo() {
return mockedNetworkInfo;
},
};
var requestPromise = null;
const mockedRequestUIGlue = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationRequestUIGlue,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationRequestUIGlue,
+ Ci.nsIFactory]),
createInstance: function(aOuter, aIID) {
if (aOuter) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return this.QueryInterface(aIID);
},
sendRequest: function(aUrl, aSessionId) {
sendAsyncMessage('receiver-launching', aSessionId);
--- a/dom/presentation/tests/mochitest/PresentationSessionChromeScript1UA.js
+++ b/dom/presentation/tests/mochitest/PresentationSessionChromeScript1UA.js
@@ -18,17 +18,17 @@ function debug(str) {
}
const originalFactoryData = [];
var sessionId; // Store the uuid generated by PresentationRequest.
var triggerControlChannelError = false; // For simulating error during control channel establishment.
// control channel of sender
const mockControlChannelOfSender = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannel]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannel]),
set listener(listener) {
// PresentationControllingInfo::SetControlChannel
if (listener) {
debug('set listener for mockControlChannelOfSender without null');
} else {
debug('set listener for mockControlChannelOfSender with null');
}
this._listener = listener;
@@ -88,17 +88,17 @@ const mockControlChannelOfSender = {
this._listener
.QueryInterface(Ci.nsIPresentationControlChannelListener)
.onIceCandidate(candidate);
},
};
// control channel of receiver
const mockControlChannelOfReceiver = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannel]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannel]),
set listener(listener) {
// PresentationPresentingInfo::SetControlChannel
if (listener) {
debug('set listener for mockControlChannelOfReceiver without null');
} else {
debug('set listener for mockControlChannelOfReceiver with null');
}
this._listener = listener;
@@ -153,17 +153,17 @@ const mockControlChannelOfReceiver = {
this._listener
.QueryInterface(Ci.nsIPresentationControlChannelListener)
.onIceCandidate(candidate);
},
};
const mockDevice = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevice]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevice]),
id: 'id',
name: 'name',
type: 'type',
establishControlChannel: function(url, presentationId) {
if (triggerControlChannelError) {
throw Cr.NS_ERROR_FAILURE;
}
sendAsyncMessage('control-channel-established');
@@ -173,18 +173,18 @@ const mockDevice = {
sendAsyncMessage('device-disconnected');
},
isRequestedUrlSupported: function(requestedUrl) {
return true;
},
};
const mockDevicePrompt = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevicePrompt,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevicePrompt,
+ Ci.nsIFactory]),
createInstance: function(aOuter, aIID) {
if (aOuter) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return this.QueryInterface(aIID);
},
set request(request) {
this._request = request;
@@ -200,18 +200,18 @@ const mockDevicePrompt = {
this._request.select(mockDevice);
},
simulateCancel: function() {
this._request.cancel();
}
};
const mockRequestUIGlue = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationRequestUIGlue,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationRequestUIGlue,
+ Ci.nsIFactory]),
set promise(aPromise) {
this._promise = aPromise
},
get promise() {
return this._promise;
},
createInstance: function(aOuter, aIID) {
if (aOuter) {
--- a/dom/presentation/tests/mochitest/test_presentation_datachannel_sessiontransport.html
+++ b/dom/presentation/tests/mochitest/test_presentation_datachannel_sessiontransport.html
@@ -37,17 +37,17 @@ var isClientReady = false;
var isServerReady = false;
var isClientClosed = false;
var isServerClosed = false;
var gResolve;
var gReject;
const clientCallback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransportCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransportCallback]),
notifyTransportReady: function () {
info("Client transport ready.");
isClientReady = true;
if (isClientReady && isServerReady) {
gResolve();
}
},
@@ -61,17 +61,17 @@ const clientCallback = {
},
notifyData: function(aData) {
is(aData, serverMessage, "Client transport receives data.");
gResolve();
},
};
const serverCallback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransportCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransportCallback]),
notifyTransportReady: function () {
info("Server transport ready.");
isServerReady = true;
if (isClientReady && isServerReady) {
gResolve();
}
},
@@ -85,17 +85,17 @@ const serverCallback = {
},
notifyData: function(aData) {
is(aData, clientMessage, "Server transport receives data.");
gResolve()
},
};
const clientListener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransportBuilderListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransportBuilderListener]),
onSessionTransport: function(aTransport) {
info("Client Transport is built.");
clientTransport = aTransport;
clientTransport.callback = clientCallback;
},
onError: function(aError) {
ok(false, "client's builder reports error " + aError);
},
@@ -116,17 +116,17 @@ const clientListener = {
this._remoteBuilder = aRemoteBuilder;
},
set localBuilder(aLocalBuilder) {
this._localBuilder = aLocalBuilder;
},
}
const serverListener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransportBuilderListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransportBuilderListener]),
onSessionTransport: function(aTransport) {
info("Server Transport is built.");
serverTransport = aTransport;
serverTransport.callback = serverCallback;
serverTransport.enableDataNotification();
},
onError: function(aError) {
ok(false, "server's builder reports error " + aError);
--- a/dom/presentation/tests/xpcshell/test_multicast_dns_device_provider.js
+++ b/dom/presentation/tests/xpcshell/test_multicast_dns_device_provider.js
@@ -59,17 +59,17 @@ MockFactory.prototype = {
return this._cls.QueryInterface(aIID);
default:
return null;
}
},
lockFactory: function(aLock) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
};
function ContractHook(aContractID, aClass) {
this._contractID = aContractID;
this.classID = Cc[UUID_CONTRACT_ID].getService(Ci.nsIUUIDGenerator).generateUUID();
this._newFactory = new MockFactory(aClass);
if (!this.hookedMap.has(this._contractID)) {
@@ -127,17 +127,17 @@ ContractHook.prototype = {
}
return { classID: classID, factory: factory };
}
};
function MockDNSServiceInfo() {}
MockDNSServiceInfo.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceInfo]),
set host(aHost) {
this._host = aHost;
},
get host() {
return this._host;
},
@@ -190,18 +190,18 @@ MockDNSServiceInfo.prototype = {
return this._attributes;
}
};
function TestPresentationDeviceListener() {
this.devices = {};
}
TestPresentationDeviceListener.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) { this.devices[device.id] = device; },
removeDevice: function(device) { delete this.devices[device.id]; },
updateDevice: function(device) { this.devices[device.id] = device; },
onSessionRequest: function(device, url, presentationId, controlChannel) {},
count: function() {
var size = 0, key;
@@ -227,23 +227,23 @@ function createDevice(host, port, servic
}
function registerService() {
Services.prefs.setBoolPref(PREF_DISCOVERABLE, true);
let deferred = Promise.defer();
let mockObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {},
registerService: function(serviceInfo, listener) {
deferred.resolve();
this.serviceRegistered++;
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: () => {
this.serviceUnregistered++;
}
};
},
resolveService: function(serviceInfo, listener) {},
serviceRegistered: 0,
serviceUnregistered: 0
@@ -251,18 +251,18 @@ function registerService() {
let contractHook = new ContractHook(SD_CONTRACT_ID, mockObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
Assert.equal(mockObj.serviceRegistered, 0);
Assert.equal(mockObj.serviceUnregistered, 0);
// Register
provider.listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {},
removeDevice: function(device) {},
updateDevice: function(device) {},
};
deferred.promise.then(function() {
Assert.equal(mockObj.serviceRegistered, 1);
Assert.equal(mockObj.serviceUnregistered, 0);
@@ -277,32 +277,32 @@ function registerService() {
}
function noRegisterService() {
Services.prefs.setBoolPref(PREF_DISCOVERABLE, false);
let deferred = Promise.defer();
let mockObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {},
registerService: function(serviceInfo, listener) {
deferred.resolve();
Assert.ok(false, "should not register service if not discoverable");
},
resolveService: function(serviceInfo, listener) {},
};
let contractHook = new ContractHook(SD_CONTRACT_ID, mockObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
// Try register
provider.listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {},
removeDevice: function(device) {},
updateDevice: function(device) {},
};
let race = Promise.race([
deferred.promise,
sleep(1000),
@@ -316,23 +316,23 @@ function noRegisterService() {
}
function registerServiceDynamically() {
Services.prefs.setBoolPref(PREF_DISCOVERABLE, false);
let deferred = Promise.defer();
let mockObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {},
registerService: function(serviceInfo, listener) {
deferred.resolve();
this.serviceRegistered++;
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: () => {
this.serviceUnregistered++;
}
};
},
resolveService: function(serviceInfo, listener) {},
serviceRegistered: 0,
serviceUnregistered: 0
@@ -340,18 +340,18 @@ function registerServiceDynamically() {
let contractHook = new ContractHook(SD_CONTRACT_ID, mockObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
Assert.equal(mockObj.serviceRegistered, 0);
Assert.equal(mockObj.serviceRegistered, 0);
// Try Register
provider.listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {},
removeDevice: function(device) {},
updateDevice: function(device) {},
};
Assert.equal(mockObj.serviceRegistered, 0);
Assert.equal(mockObj.serviceUnregistered, 0);
@@ -379,25 +379,25 @@ function registerServiceDynamically() {
function addDevice() {
Services.prefs.setBoolPref(PREF_DISCOVERY, true);
let mockDevice = createDevice("device.local",
12345,
"service.name",
SERVICE_TYPE);
let mockObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
listener.onServiceFound(createDevice("",
0,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
registerService: function(serviceInfo, listener) {},
resolveService: function(serviceInfo, listener) {
Assert.equal(serviceInfo.serviceName, mockDevice.serviceName);
Assert.equal(serviceInfo.serviceType, mockDevice.serviceType);
listener.onServiceResolved(createDevice(mockDevice.host,
@@ -429,25 +429,25 @@ function addDevice() {
function filterDevice() {
Services.prefs.setBoolPref(PREF_DISCOVERY, true);
let mockDevice = createDevice("device.local",
12345,
"service.name",
SERVICE_TYPE);
let mockObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
listener.onServiceFound(createDevice("",
0,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
registerService: function(serviceInfo, listener) {},
resolveService: function(serviceInfo, listener) {
Assert.equal(serviceInfo.serviceName, mockDevice.serviceName);
Assert.equal(serviceInfo.serviceType, mockDevice.serviceType);
listener.onServiceResolved(createDevice(mockDevice.host,
@@ -455,18 +455,18 @@ function filterDevice() {
mockDevice.serviceName,
mockDevice.serviceType));
}
};
let contractHook = new ContractHook(SD_CONTRACT_ID, mockObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {
let tests = [
{ requestedUrl: "app://fling-player.gaiamobile.org/index.html", supported: true },
{ requestedUrl: "app://notification-receiver.gaiamobile.org/index.html", supported: true },
{ requestedUrl: "http://example.com", supported: true },
{ requestedUrl: "https://example.com", supported: true },
{ requestedUrl: "ftp://example.com", supported: false },
{ requestedUrl: "app://unknown-app-id", supported: false },
@@ -499,60 +499,60 @@ function handleSessionRequest() {
Services.prefs.setCharPref(PREF_DEVICENAME, testDeviceName);
let mockDevice = createDevice("device.local",
12345,
"service.name",
SERVICE_TYPE);
let mockSDObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
listener.onServiceFound(createDevice("",
0,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
registerService: function(serviceInfo, listener) {},
resolveService: function(serviceInfo, listener) {
listener.onServiceResolved(createDevice(mockDevice.host,
mockDevice.port,
mockDevice.serviceName,
mockDevice.serviceType));
}
};
let mockServerObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlService]),
connect: function(deviceInfo) {
this.request = {
deviceInfo: deviceInfo,
};
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannel]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannel]),
};
},
id: "",
version: LATEST_VERSION,
isCompatibleServer: function(version) {
return this.version === version;
}
};
let contractHookSD = new ContractHook(SD_CONTRACT_ID, mockSDObj);
let contractHookServer = new ContractHook(SERVER_CONTRACT_ID, mockServerObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {
this.device = device;
},
};
provider.listener = listener;
let controlChannel = listener.device.establishControlChannel();
@@ -571,80 +571,80 @@ function handleOnSessionRequest() {
Services.prefs.setBoolPref(PREF_DISCOVERY, true);
Services.prefs.setBoolPref(PREF_DISCOVERABLE, true);
let mockDevice = createDevice("device.local",
12345,
"service.name",
SERVICE_TYPE);
let mockSDObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
listener.onServiceFound(createDevice("",
0,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
registerService: function(serviceInfo, listener) {},
resolveService: function(serviceInfo, listener) {
listener.onServiceResolved(createDevice(mockDevice.host,
mockDevice.port,
mockDevice.serviceName,
mockDevice.serviceType));
}
};
let mockServerObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlService]),
startServer: function() {},
sessionRequest: function() {},
close: function() {},
id: '',
version: LATEST_VERSION,
port: 0,
listener: null,
};
let contractHookSD = new ContractHook(SD_CONTRACT_ID, mockSDObj);
let contractHookServer = new ContractHook(SERVER_CONTRACT_ID, mockServerObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {},
removeDevice: function(device) {},
updateDevice: function(device) {},
onSessionRequest: function(device, url, presentationId, controlChannel) {
Assert.ok(true, "receive onSessionRequest event");
this.request = {
deviceId: device.id,
url: url,
presentationId: presentationId,
};
}
};
provider.listener = listener;
const deviceInfo = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITCPDeviceInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITCPDeviceInfo]),
id: mockDevice.host,
address: mockDevice.host,
port: 54321,
};
const testUrl = "http://example.com";
const testPresentationId = "test-presentation-id";
const testControlChannel = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannel]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannel]),
};
provider.QueryInterface(Ci.nsIPresentationControlServerListener)
.onSessionRequest(deviceInfo, testUrl, testPresentationId, testControlChannel);
Assert.equal(listener.request.deviceId, deviceInfo.id);
Assert.equal(listener.request.url, testUrl);
Assert.equal(listener.request.presentationId, testPresentationId);
@@ -653,39 +653,39 @@ function handleOnSessionRequest() {
run_next_test();
}
function handleOnSessionRequestFromUnknownDevice() {
Services.prefs.setBoolPref(PREF_DISCOVERY, false);
Services.prefs.setBoolPref(PREF_DISCOVERABLE, true);
let mockSDObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {},
registerService: function(serviceInfo, listener) {},
resolveService: function(serviceInfo, listener) {}
};
let mockServerObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlService]),
startServer: function() {},
sessionRequest: function() {},
close: function() {},
id: '',
version: LATEST_VERSION,
port: 0,
listener: null,
};
let contractHookSD = new ContractHook(SD_CONTRACT_ID, mockSDObj);
let contractHookServer = new ContractHook(SERVER_CONTRACT_ID, mockServerObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {
Assert.ok(false, "shouldn't create any new device");
},
removeDevice: function(device) {
Assert.ok(false, "shouldn't remote any device");
},
updateDevice: function(device) {
Assert.ok(false, "shouldn't update any device");
@@ -698,26 +698,26 @@ function handleOnSessionRequestFromUnkno
presentationId: presentationId,
};
}
};
provider.listener = listener;
const deviceInfo = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITCPDeviceInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITCPDeviceInfo]),
id: "unknown-device.local",
address: "unknown-device.local",
port: 12345,
};
const testUrl = "http://example.com";
const testPresentationId = "test-presentation-id";
const testControlChannel = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannel]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannel]),
};
provider.QueryInterface(Ci.nsIPresentationControlServerListener)
.onSessionRequest(deviceInfo, testUrl, testPresentationId, testControlChannel);
Assert.equal(listener.request.deviceId, deviceInfo.id);
Assert.equal(listener.request.url, testUrl);
Assert.equal(listener.request.presentationId, testPresentationId);
@@ -726,30 +726,30 @@ function handleOnSessionRequestFromUnkno
run_next_test();
}
function noAddDevice() {
Services.prefs.setBoolPref(PREF_DISCOVERY, false);
let mockDevice = createDevice("device.local", 12345, "service.name", SERVICE_TYPE);
let mockObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
Assert.ok(false, "shouldn't perform any device discovery");
},
registerService: function(serviceInfo, listener) {},
resolveService: function(serviceInfo, listener) {
}
};
let contractHook = new ContractHook(SD_CONTRACT_ID, mockObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {},
removeDevice: function(device) {},
updateDevice: function(device) {},
};
provider.listener = listener;
provider.forceDiscovery();
provider.listener = null;
@@ -763,51 +763,51 @@ function ignoreIncompatibleDevice() {
let mockDevice = createDevice("device.local",
12345,
"service.name",
SERVICE_TYPE);
let deferred = Promise.defer();
let mockSDObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
listener.onServiceFound(createDevice("",
0,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
registerService: function(serviceInfo, listener) {
deferred.resolve();
listener.onServiceRegistered(createDevice("",
54321,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
resolveService: function(serviceInfo, listener) {
Assert.equal(serviceInfo.serviceName, mockDevice.serviceName);
Assert.equal(serviceInfo.serviceType, mockDevice.serviceType);
listener.onServiceResolved(createDevice(mockDevice.host,
mockDevice.port,
mockDevice.serviceName,
mockDevice.serviceType));
}
};
let mockServerObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlService]),
startServer: function() {
Services.tm.dispatchToMainThread(() => {
this.listener.onServerReady(this.port, this.certFingerprint);
});
},
sessionRequest: function() {},
close: function() {},
id: '',
@@ -848,51 +848,51 @@ function ignoreSelfDevice() {
let mockDevice = createDevice("device.local",
12345,
"service.name",
SERVICE_TYPE);
let deferred = Promise.defer();
let mockSDObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
listener.onServiceFound(createDevice("",
0,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
registerService: function(serviceInfo, listener) {
deferred.resolve();
listener.onServiceRegistered(createDevice("",
0,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
resolveService: function(serviceInfo, listener) {
Assert.equal(serviceInfo.serviceName, mockDevice.serviceName);
Assert.equal(serviceInfo.serviceType, mockDevice.serviceType);
listener.onServiceResolved(createDevice(mockDevice.host,
mockDevice.port,
mockDevice.serviceName,
mockDevice.serviceType));
}
};
let mockServerObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlService]),
startServer: function() {
Services.tm.dispatchToMainThread(() => {
this.listener.onServerReady(this.port, this.certFingerprint);
});
},
sessionRequest: function() {},
close: function() {},
id: '',
@@ -929,25 +929,25 @@ function ignoreSelfDevice() {
function addDeviceDynamically() {
Services.prefs.setBoolPref(PREF_DISCOVERY, false);
let mockDevice = createDevice("device.local",
12345,
"service.name",
SERVICE_TYPE);
let mockObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
listener.onServiceFound(createDevice("",
0,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
registerService: function(serviceInfo, listener) {},
resolveService: function(serviceInfo, listener) {
Assert.equal(serviceInfo.serviceName, mockDevice.serviceName);
Assert.equal(serviceInfo.serviceType, mockDevice.serviceType);
listener.onServiceResolved(createDevice(mockDevice.host,
@@ -986,29 +986,29 @@ function updateDevice() {
Services.prefs.setBoolPref(PREF_DISCOVERY, true);
let mockDevice1 = createDevice("A.local", 12345, "N1", SERVICE_TYPE);
let mockDevice2 = createDevice("A.local", 23456, "N2", SERVICE_TYPE);
let mockObj = {
discovered: false,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
if (!this.discovered) {
listener.onServiceFound(mockDevice1);
} else {
listener.onServiceFound(mockDevice2);
}
this.discovered = true;
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {
listener.onDiscoveryStopped(serviceType);
}
};
},
registerService: function(serviceInfo, listener) {},
resolveService: function(serviceInfo, listener) {
Assert.equal(serviceInfo.serviceType, SERVICE_TYPE);
@@ -1020,18 +1020,18 @@ function updateDevice() {
Assert.ok(false);
}
}
};
let contractHook = new ContractHook(SD_CONTRACT_ID, mockObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {
Assert.ok(!this.isDeviceAdded);
Assert.equal(device.id, mockDevice1.host);
Assert.equal(device.name, mockDevice1.serviceName);
this.isDeviceAdded = true;
},
removeDevice: function(device) { Assert.ok(false); },
@@ -1073,31 +1073,31 @@ function diffDiscovery() {
let mockDevice1 = createDevice("A.local", 12345, "N1", SERVICE_TYPE);
let mockDevice2 = createDevice("B.local", 23456, "N2", SERVICE_TYPE);
let mockDevice3 = createDevice("C.local", 45678, "N3", SERVICE_TYPE);
let mockObj = {
discovered: false,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
if (!this.discovered) {
listener.onServiceFound(mockDevice1);
listener.onServiceFound(mockDevice2);
} else {
listener.onServiceFound(mockDevice1);
listener.onServiceFound(mockDevice3);
}
this.discovered = true;
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {
listener.onDiscoveryStopped(serviceType);
}
};
},
registerService: function(serviceInfo, listener) {},
resolveService: function(serviceInfo, listener) {
Assert.equal(serviceInfo.serviceType, SERVICE_TYPE);
@@ -1155,32 +1155,32 @@ function serverClosed() {
Services.prefs.setBoolPref(PREF_DISCOVERY, true);
let mockDevice = createDevice("device.local",
12345,
"service.name",
SERVICE_TYPE);
let mockObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {
listener.onDiscoveryStarted(serviceType);
listener.onServiceFound(createDevice("",
0,
mockDevice.serviceName,
mockDevice.serviceType));
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {}
};
},
registerService: function(serviceInfo, listener) {
this.serviceRegistered++;
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: () => {
this.serviceUnregistered++;
}
};
},
resolveService: function(serviceInfo, listener) {
Assert.equal(serviceInfo.serviceName, mockDevice.serviceName);
Assert.equal(serviceInfo.serviceType, mockDevice.serviceType);
@@ -1195,18 +1195,18 @@ function serverClosed() {
let contractHook = new ContractHook(SD_CONTRACT_ID, mockObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
Assert.equal(mockObj.serviceRegistered, 0);
Assert.equal(mockObj.serviceUnregistered, 0);
// Register
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) { this.devices.push(device); },
removeDevice: function(device) {},
updateDevice: function(device) {},
devices: []
};
Assert.equal(listener.devices.length, 0);
provider.listener = listener;
@@ -1233,28 +1233,28 @@ function serverClosed() {
function serverRetry() {
Services.prefs.setBoolPref(PREF_DISCOVERY, false);
Services.prefs.setBoolPref(PREF_DISCOVERABLE, true);
let isRetrying = false;
let mockSDObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(serviceType, listener) {},
registerService: function(serviceInfo, listener) {
Assert.ok(isRetrying, "register service after retrying startServer");
provider.listener = null;
run_next_test();
},
resolveService: function(serviceInfo, listener) {}
};
let mockServerObj = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlService]),
startServer: function(encrypted, port) {
if (!isRetrying) {
isRetrying = true;
Services.tm.dispatchToMainThread(() => {
this.listener.onServerStopped(Cr.NS_ERROR_FAILURE);
});
} else {
this.port = 54321;
@@ -1271,18 +1271,18 @@ function serverRetry() {
certFingerprint: 'mock-cert-fingerprint',
listener: null,
};
let contractHookSD = new ContractHook(SD_CONTRACT_ID, mockSDObj);
let contractHookServer = new ContractHook(SERVER_CONTRACT_ID, mockServerObj);
let provider = Cc[PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
addDevice: function(device) {},
removeDevice: function(device) {},
updateDevice: function(device) {},
onSessionRequest: function(device, url, presentationId, controlChannel) {}
};
provider.listener = listener;
}
--- a/dom/presentation/tests/xpcshell/test_presentation_device_manager.js
+++ b/dom/presentation/tests/xpcshell/test_presentation_device_manager.js
@@ -11,41 +11,41 @@ const manager = Cc['@mozilla.org/present
.getService(Ci.nsIPresentationDeviceManager);
function TestPresentationDevice() {}
function TestPresentationControlChannel() {}
TestPresentationControlChannel.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannel]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannel]),
sendOffer: function(offer) {},
sendAnswer: function(answer) {},
disconnect: function() {},
launch: function() {},
terminate: function() {},
reconnect: function() {},
set listener(listener) {},
get listener() {},
};
var testProvider = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceProvider]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceProvider]),
forceDiscovery: function() {
},
set listener(listener) {
},
get listener() {
},
};
const forbiddenRequestedUrl = 'http://example.com';
var testDevice = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevice]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevice]),
id: 'id',
name: 'name',
type: 'type',
establishControlChannel: function(url, presentationId) {
return null;
},
disconnect: function() {},
isRequestedUrlSupported: function(requestedUrl) {
--- a/dom/presentation/tests/xpcshell/test_presentation_session_transport.js
+++ b/dom/presentation/tests/xpcshell/test_presentation_session_transport.js
@@ -24,28 +24,28 @@ const serverMessage = "Server Message";
const address = Cc["@mozilla.org/supports-cstring;1"]
.createInstance(Ci.nsISupportsCString);
address.data = "127.0.0.1";
const addresses = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
addresses.appendElement(address);
const serverChannelDescription = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationChannelDescription]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationChannelDescription]),
type: 1,
tcpAddress: addresses,
};
var isClientReady = false;
var isServerReady = false;
var isClientClosed = false;
var isServerClosed = false;
const clientCallback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransportCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransportCallback]),
notifyTransportReady: function () {
Assert.ok(true, "Client transport ready.");
isClientReady = true;
if (isClientReady && isServerReady) {
run_next_test();
}
},
@@ -59,17 +59,17 @@ const clientCallback = {
},
notifyData: function(aData) {
Assert.equal(aData, serverMessage, "Client transport receives data.");
run_next_test();
},
};
const serverCallback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransportCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransportCallback]),
notifyTransportReady: function () {
Assert.ok(true, "Server transport ready.");
isServerReady = true;
if (isClientReady && isServerReady) {
run_next_test();
}
},
@@ -83,30 +83,30 @@ const serverCallback = {
},
notifyData: function(aData) {
Assert.equal(aData, clientMessage, "Server transport receives data.");
run_next_test();
},
};
const clientListener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransportBuilderListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransportBuilderListener]),
onSessionTransport(aTransport) {
Assert.ok(true, "Client Transport is built.");
clientTransport = aTransport;
clientTransport.callback = clientCallback;
if (serverTransport) {
run_next_test();
}
}
}
const serverListener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationSessionTransportBuilderListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationSessionTransportBuilderListener]),
onSessionTransport(aTransport) {
Assert.ok(true, "Server Transport is built.");
serverTransport = aTransport;
serverTransport.callback = serverCallback;
serverTransport.enableDataNotification();
if (clientTransport) {
run_next_test();
--- a/dom/presentation/tests/xpcshell/test_tcp_control_channel.js
+++ b/dom/presentation/tests/xpcshell/test_tcp_control_channel.js
@@ -31,17 +31,17 @@ function TestDescription(aType, aTcpAddr
.createInstance(Ci.nsISupportsCString);
wrapper.data = address;
this.tcpAddress.appendElement(wrapper);
}
this.tcpPort = aTcpPort;
}
TestDescription.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationChannelDescription]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationChannelDescription]),
}
const CONTROLLER_CONTROL_CHANNEL_PORT = 36777;
const PRESENTER_CONTROL_CHANNEL_PORT = 36888;
var CLOSE_CONTROL_CHANNEL_REASON = Cr.NS_OK;
var candidate;
@@ -121,34 +121,34 @@ function testPresentationServer() {
this.status = 'opened';
},
notifyDisconnected: function(aReason) {
Assert.equal(this.status, 'onOffer', '4. presenterControlChannel: closed');
Assert.equal(aReason, CLOSE_CONTROL_CHANNEL_REASON, 'presenterControlChannel notify closed');
this.status = 'closed';
yayFuncs.controllerControlChannelClose();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
};
},
onReconnectRequest: function(deviceInfo, url, presentationId, controlChannel) {
Assert.equal(url, 'http://example.com', 'expected url');
Assert.equal(presentationId, 'testPresentationId', 'expected presentation id');
yayFuncs.presenterControlChannelReconnect();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlServerListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlServerListener]),
};
let presenterDeviceInfo = {
id: 'presentatorID',
address: '127.0.0.1',
port: PRESENTER_CONTROL_CHANNEL_PORT,
certFingerprint: pcs.certFingerprint,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITCPDeviceInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITCPDeviceInfo]),
};
let controllerControlChannel = pcs.connect(presenterDeviceInfo);
controllerControlChannel.listener = {
status: 'created',
onOffer: function(offer) {
Assert.ok(false, 'get offer');
@@ -191,20 +191,20 @@ function testPresentationServer() {
let reconnectControllerControlChannel = pcs.connect(presenterDeviceInfo);
reconnectControllerControlChannel.listener = {
notifyConnected: function() {
reconnectControllerControlChannel.reconnect('testPresentationId', 'http://example.com');
},
notifyReconnected: function() {
yayFuncs.controllerControlChannelReconnect();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
};
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
};
}
function terminateRequest() {
let yayFuncs = makeJointSuccess(['controllerControlChannelConnected',
'controllerControlChannelDisconnected',
'presenterControlChannelDisconnected',
'terminatedByController',
@@ -231,47 +231,47 @@ function terminateRequest() {
terminatePhase = 'receiver';
controllerControlChannel.terminate('testPresentationId');
},
notifyDisconnected: function(aReason) {
Assert.equal(aReason, CLOSE_CONTROL_CHANNEL_REASON, 'controllerControlChannel notify disconncted');
yayFuncs.controllerControlChannelDisconnected();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
};
} else {
Assert.equal(deviceInfo.id, presenterDeviceInfo.id, 'expected presenter device id');
Assert.equal(isFromReceiver, true, 'expected request from receiver');
yayFuncs.terminatedByReceiver();
presenterControlChannel.disconnect(CLOSE_CONTROL_CHANNEL_REASON);
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITCPPresentationServerListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITCPPresentationServerListener]),
};
let presenterDeviceInfo = {
id: 'presentatorID',
address: '127.0.0.1',
port: PRESENTER_CONTROL_CHANNEL_PORT,
certFingerprint: pcs.certFingerprint,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITCPDeviceInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITCPDeviceInfo]),
};
let presenterControlChannel = pcs.connect(presenterDeviceInfo);
presenterControlChannel.listener = {
notifyConnected: function() {
presenterControlChannel.terminate('testPresentationId');
},
notifyDisconnected: function(aReason) {
Assert.equal(aReason, CLOSE_CONTROL_CHANNEL_REASON, '4. presenterControlChannel notify disconnected');
yayFuncs.presenterControlChannelDisconnected();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
};
}
function terminateRequestAbnormal() {
let yayFuncs = makeJointSuccess(['controllerControlChannelConnected',
'controllerControlChannelDisconnected',
'presenterControlChannelDisconnected']);
let controllerControlChannel;
@@ -290,41 +290,41 @@ function terminateRequestAbnormal() {
notifyConnected: function() {
Assert.ok(true, 'control channel notify connected');
yayFuncs.controllerControlChannelConnected();
},
notifyDisconnected: function(aReason) {
Assert.equal(aReason, Cr.NS_ERROR_FAILURE, 'controllerControlChannel notify disconncted with error');
yayFuncs.controllerControlChannelDisconnected();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
};
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITCPPresentationServerListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITCPPresentationServerListener]),
};
let presenterDeviceInfo = {
id: 'presentatorID',
address: '127.0.0.1',
port: PRESENTER_CONTROL_CHANNEL_PORT,
certFingerprint: pcs.certFingerprint,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITCPDeviceInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITCPDeviceInfo]),
};
let presenterControlChannel = pcs.connect(presenterDeviceInfo);
presenterControlChannel.listener = {
notifyConnected: function() {
presenterControlChannel.terminate('testPresentationId');
},
notifyDisconnected: function(aReason) {
Assert.equal(aReason, Cr.NS_ERROR_FAILURE, '4. presenterControlChannel notify disconnected with error');
yayFuncs.presenterControlChannelDisconnected();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannelListener]),
};
}
function setOffline() {
pcs.listener = {
onServerReady: function(aPort, aCertFingerprint) {
Assert.notEqual(aPort, 0, 'TCPPresentationServer port changed and the port should be valid');
pcs.close();
--- a/dom/push/Push.js
+++ b/dom/push/Push.js
@@ -32,19 +32,19 @@ function Push() {
Push.prototype = {
__proto__: DOMRequestIpcHelper.prototype,
contractID: "@mozilla.org/push/PushManager;1",
classID : PUSH_CID,
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer,
- Ci.nsISupportsWeakReference,
- Ci.nsIObserver]),
+ QueryInterface : ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer,
+ Ci.nsISupportsWeakReference,
+ Ci.nsIObserver]),
init: function(win) {
console.debug("init()");
this._window = win;
this.initDOMRequestHelper(win);
@@ -177,26 +177,26 @@ Push.prototype = {
},
_requestPermission: function(allowCallback, cancelCallback) {
// Create an array with a single nsIContentPermissionType element.
let type = {
type: "desktop-notification",
access: null,
options: [],
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionType]),
};
let typeArray = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
typeArray.appendElement(type);
// create a nsIContentPermissionRequest
let request = {
types: typeArray,
principal: this._principal,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionRequest]),
allow: allowCallback,
cancel: cancelCallback,
window: this._window,
};
// Using askPermission from nsIDOMWindowUtils that takes care of the
// remoting if needed.
let windowUtils = this._window.QueryInterface(Ci.nsIInterfaceRequestor)
@@ -207,17 +207,17 @@ Push.prototype = {
function PushSubscriptionCallback(pushManager, resolve, reject) {
this.pushManager = pushManager;
this.resolve = resolve;
this.reject = reject;
}
PushSubscriptionCallback.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPushSubscriptionCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPushSubscriptionCallback]),
onPushSubscription: function(ok, subscription) {
let {pushManager} = this;
if (!Components.isSuccessCode(ok)) {
this._rejectWithError(ok);
return;
}
--- a/dom/push/PushComponents.js
+++ b/dom/push/PushComponents.js
@@ -44,17 +44,17 @@ const OBSERVER_TOPIC_SUBSCRIPTION_MODIFI
function PushServiceBase() {
this.wrappedJSObject = this;
this._addListeners();
}
PushServiceBase.prototype = {
classID: Components.ID("{daaa8d73-677e-4233-8acd-2c404bd01658}"),
contractID: "@mozilla.org/push/Service;1",
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
Ci.nsIPushService,
Ci.nsIPushQuotaManager,
Ci.nsIPushErrorReporter,
]),
pushTopic: OBSERVER_TOPIC_PUSH,
@@ -454,17 +454,17 @@ Object.assign(PushServiceContent.prototy
});
/** `PushSubscription` instances are passed to all subscription callbacks. */
function PushSubscription(props) {
this._props = props;
}
PushSubscription.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPushSubscription]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPushSubscription]),
/** The URL for sending messages to this subscription. */
get endpoint() {
return this._props.endpoint;
},
/** The last time a message was sent to this subscription. */
get lastPush() {
--- a/dom/push/test/mockpushserviceparent.js
+++ b/dom/push/test/mockpushserviceparent.js
@@ -25,20 +25,17 @@ function MockWebSocketParent(originalURI
}
MockWebSocketParent.prototype = {
_originalURI: null,
_listener: null,
_context: null,
- QueryInterface: XPCOMUtils.generateQI([
- Ci.nsISupports,
- Ci.nsIWebSocketChannel
- ]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebSocketChannel]),
get originalURI() {
return this._originalURI;
},
asyncOpen(uri, origin, windowId, listener, context) {
this._listener = listener;
this._context = context;
--- a/dom/push/test/xpcshell/PushServiceHandler.js
+++ b/dom/push/test/xpcshell/PushServiceHandler.js
@@ -14,16 +14,16 @@ function PushServiceHandler() {
this.observed = [];
Services.obs.addObserver(this, pushService.pushTopic);
Services.obs.addObserver(this, pushService.subscriptionChangeTopic);
Services.obs.addObserver(this, pushService.subscriptionModifiedTopic);
}
PushServiceHandler.prototype = {
classID: Components.ID("{bb7c5199-c0f7-4976-9f6d-1306e32c5591}"),
- QueryInterface: XPCOMUtils.generateQI([]),
+ QueryInterface: ChromeUtils.generateQI([]),
observe(subject, topic, data) {
this.observed.push({ subject, topic, data });
},
}
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PushServiceHandler]);
--- a/dom/push/test/xpcshell/head.js
+++ b/dom/push/test/xpcshell/head.js
@@ -193,20 +193,17 @@ MockWebSocket.prototype = {
_onRegister: null,
_onUnregister: null,
_onACK: null,
_onPing: null,
_listener: null,
_context: null,
- QueryInterface: XPCOMUtils.generateQI([
- Ci.nsISupports,
- Ci.nsIWebSocketChannel
- ]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebSocketChannel]),
get originalURI() {
return this._originalURI;
},
asyncOpen(uri, origin, windowId, listener, context) {
this._listener = listener;
this._context = context;
--- a/dom/push/test/xpcshell/test_permissions.js
+++ b/dom/push/test/xpcshell/test_permissions.js
@@ -24,17 +24,17 @@ function run_test() {
let unregisterDefers = {};
function promiseUnregister(keyID) {
return new Promise(r => unregisterDefers[keyID] = r);
}
function makePushPermission(url, capability) {
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPermission]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPermission]),
capability: Ci.nsIPermissionManager[capability],
expireTime: 0,
expireType: Ci.nsIPermissionManager.EXPIRE_NEVER,
principal: Services.scriptSecurityManager.createCodebasePrincipal(
Services.io.newURI(url), {}
),
type: 'desktop-notification',
};
--- a/dom/system/NetworkGeolocationProvider.js
+++ b/dom/system/NetworkGeolocationProvider.js
@@ -206,27 +206,27 @@ function WifiGeoCoordsObject(lat, lon, a
this.latitude = lat;
this.longitude = lon;
this.accuracy = acc;
this.altitude = alt;
this.altitudeAccuracy = altacc;
}
WifiGeoCoordsObject.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDOMGeoPositionCoords])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGeoPositionCoords])
};
function WifiGeoPositionObject(lat, lng, acc) {
this.coords = new WifiGeoCoordsObject(lat, lng, acc, 0, 0);
this.address = null;
this.timestamp = Date.now();
}
WifiGeoPositionObject.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDOMGeoPosition])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGeoPosition])
};
function WifiGeoPositionProvider() {
try {
gLoggingEnabled = Services.prefs.getBoolPref("geo.wifi.logging.enabled");
} catch (e) {}
try {
@@ -239,20 +239,20 @@ function WifiGeoPositionProvider() {
this.wifiService = null;
this.timer = null;
this.started = false;
}
WifiGeoPositionProvider.prototype = {
classID: Components.ID("{77DA64D3-7458-4920-9491-86CC9914F904}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIGeolocationProvider,
- Ci.nsIWifiListener,
- Ci.nsITimerCallback,
- Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIGeolocationProvider,
+ Ci.nsIWifiListener,
+ Ci.nsITimerCallback,
+ Ci.nsIObserver]),
listener: null,
resetTimer: function() {
if (this.timer) {
this.timer.cancel();
this.timer = null;
}
// wifi thread triggers WifiGeoPositionProvider to proceed, with no wifi, do manual timeout
--- a/dom/tests/browser/browser_ConsoleAPI_originAttributes.js
+++ b/dom/tests/browser/browser_ConsoleAPI_originAttributes.js
@@ -5,17 +5,17 @@ const ConsoleAPIStorage = Cc["@mozilla.o
.getService(Ci.nsIConsoleAPIStorage);
const {WebExtensionPolicy} = Cu.getGlobalForObject(ChromeUtils.import("resource://gre/modules/Services.jsm", {}));
const FAKE_ADDON_ID = "test-webext-addon@mozilla.org";
const EXPECTED_CONSOLE_ID = `addon/${FAKE_ADDON_ID}`;
const EXPECTED_CONSOLE_MESSAGE_CONTENT = "fake-webext-addon-test-log-message";
const ConsoleObserver = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
init() {
Services.obs.addObserver(this, "console-api-log-event");
},
uninit() {
Services.obs.removeObserver(this, "console-api-log-event");
},
--- a/dom/tests/browser/browser_ConsoleStorageAPITests.js
+++ b/dom/tests/browser/browser_ConsoleStorageAPITests.js
@@ -28,17 +28,17 @@ add_task(async function()
let observerPromise = ContentTask.spawn(browser, null, async function(opt) {
const TEST_URI = "http://example.com/browser/dom/tests/browser/test-console-api.html";
let ConsoleAPIStorage = Cc["@mozilla.org/consoleAPI-storage;1"]
.getService(Ci.nsIConsoleAPIStorage);
let observerPromise = new Promise(resolve => {
let apiCallCount = 0;
let ConsoleObserver = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
observe: function(aSubject, aTopic, aData) {
if (aTopic == "console-storage-cache-event") {
apiCallCount++;
if (apiCallCount == 4) {
let windowId = content.window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
--- a/dom/tests/browser/browser_bug1004814.js
+++ b/dom/tests/browser/browser_bug1004814.js
@@ -5,17 +5,17 @@
add_task(async function() {
await BrowserTestUtils.withNewTab("about:blank", async function(aBrowser) {
let duration = await ContentTask.spawn(aBrowser, null, function (opts) {
const TEST_URI = "http://example.com/browser/dom/tests/browser/test_bug1004814.html";
return new Promise(resolve => {
let ConsoleObserver = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
observe: function(aSubject, aTopic, aData) {
var obj = aSubject.wrappedJSObject;
if (obj.arguments.length != 1 || obj.arguments[0] != 'bug1004814' ||
obj.level != 'timeEnd') {
return;
}
--- a/dom/tests/mochitest/bugs/test_bug61098.html
+++ b/dom/tests/mochitest/bugs/test_bug61098.html
@@ -32,17 +32,17 @@ function registerMockPromptService()
var XPCOMUtils = SpecialPowers.Cu.import("resource://gre/modules/XPCOMUtils.jsm").XPCOMUtils;
var Ci = SpecialPowers.Ci;
function MockPrompt(aDOMWindow) {
this.domWindow = SpecialPowers.unwrap(aDOMWindow);
}
MockPrompt.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt]),
domWindow : null,
_toggleModalState: function()
{
// The real prompt service puts the window into a modal state
// immediately before showing a modal prompt, and leaves the modal state
// when the prompt is dismissed by the user. This mock prompt doesn't
@@ -149,17 +149,17 @@ function registerMockPromptService()
// Override the prompt service with our own so that we can test
// modal dialogs
function MockPromptService()
{
}
MockPromptService.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIPromptService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIPromptService]),
getPrompt: function(aDOMWindow, aIID)
{
return new MockPrompt(aDOMWindow);
},
alert: function(aParent, aDialogTitle, aText)
{
--- a/dom/websocket/tests/test_websocket_frame.html
+++ b/dom/websocket/tests/test_websocket_frame.html
@@ -31,17 +31,17 @@ var innerId =
.getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
ok(innerId, "We have a valid innerWindowID: " + innerId);
var service = Cc["@mozilla.org/websocketevent/service;1"]
.getService(Ci.nsIWebSocketEventService);
ok(!!service, "We have the nsIWebSocketEventService");
var listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebSocketEventListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebSocketEventListener]),
webSocketCreated: function(aWebSocketSerialID, aURI, aProtocols) {
info("WebSocketCreated");
is(aURI, URI, "URI matches");
is(aProtocols, "frame", "Protocol matches");
webSocketCreatedCounter++;
--- a/dom/workers/test/extensions/bootstrap/bootstrap.js
+++ b/dom/workers/test/extensions/bootstrap/bootstrap.js
@@ -91,17 +91,17 @@ WorkerTestBootstrap.prototype = {
gWorkerAndCallback.terminate();
break;
default:
throw new Error("Unknown worker command");
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
var gFactory = {
register: function() {
var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
var classID = Components.ID("{36b5df0b-8dcf-4aa2-9c45-c51d871295f9}");
var description = "WorkerTestBootstrap";
--- a/dom/workers/test/test_extensionBootstrap.xul
+++ b/dom/workers/test/test_extensionBootstrap.xul
@@ -36,17 +36,17 @@
"." + symbol),
true,
"Symbol '" + symbol + "' present during '" + stage + "'");
}
}
SimpleTest.finish();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
var workertestbootstrap = Cc["@mozilla.org/test/workertestbootstrap;1"].
createInstance(Ci.nsIObserver);
workertestbootstrap.observe(observer, "postMessage", message);
SimpleTest.waitForExplicitFinish();
--- a/dom/xslt/xslt/txEXSLTRegExFunctions.js
+++ b/dom/xslt/xslt/txEXSLTRegExFunctions.js
@@ -11,17 +11,17 @@ function txEXSLTRegExFunctions()
{
}
var SingletonInstance = null;
txEXSLTRegExFunctions.prototype = {
classID: EXSLT_REGEXP_CID,
- QueryInterface: XPCOMUtils.generateQI([Ci.txIEXSLTRegExFunctions]),
+ QueryInterface: ChromeUtils.generateQI([Ci.txIEXSLTRegExFunctions]),
// txIEXSLTRegExFunctions
match: function(str, regex, flags, doc) {
var docFrag = doc.createDocumentFragment();
var re = new RegExp(regex, flags);
var matches = str.match(re);
if (matches != null) {
for (var i = 0; i < matches.length; ++i) {
--- a/editor/composer/test/test_bug1266815.html
+++ b/editor/composer/test/test_bug1266815.html
@@ -33,17 +33,17 @@ var helperAppDlgPromise = new Promise(fu
HelperAppLauncherDialog.prototype = {
show: function(aLauncher, aWindowContext, aReason) {
ok(true, "Whether showing Dialog");
resolve();
registrar.unregisterFactory(MOCK_HELPERAPP_DIALOG_CID,
mockHelperAppService);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIHelperAppLauncherDialog])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIHelperAppLauncherDialog])
};
mockHelperAppService = XPCOMUtils._getFactory(HelperAppLauncherDialog);
registrar.registerFactory(MOCK_HELPERAPP_DIALOG_CID, "",
HELPERAPP_DIALOG_CONTRACT_ID,
mockHelperAppService);
});
--- a/editor/libeditor/EditorUtils.js
+++ b/editor/libeditor/EditorUtils.js
@@ -9,17 +9,17 @@ ChromeUtils.import("resource://gre/modul
const EDITORUTILS_CID = Components.ID('{12e63991-86ac-4dff-bb1a-703495d67d17}');
function EditorUtils() {
}
EditorUtils.prototype = {
classID: EDITORUTILS_CID,
- QueryInterface: XPCOMUtils.generateQI([ Ci.nsIEditorUtils ]),
+ QueryInterface: ChromeUtils.generateQI([ Ci.nsIEditorUtils ]),
slurpBlob(aBlob, aScope, aListener) {
let reader = new aScope.FileReader();
reader.addEventListener("load", (event) => {
aListener.onResult(event.target.result);
});
reader.addEventListener("error", (event) => {
aListener.onError(event.target.error.message);
--- a/extensions/cookie/test/unit/test_permmanager_migrate_4-7_no_history.js
+++ b/extensions/cookie/test/unit/test_permmanager_migrate_4-7_no_history.js
@@ -10,17 +10,17 @@ var PERMISSIONS_FILE_NAME = "permissions
var CONTRACT_ID = "@mozilla.org/browser/nav-history-service;1";
var factory = {
createInstance: function() {
throw new Error("There is no history service");
},
lockFactory: function() {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
};
var newClassID = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator).generateUUID();
var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
var oldClassID = registrar.contractIDToCID(CONTRACT_ID);
var oldFactory = Components.manager.getClassObject(Cc[CONTRACT_ID], Ci.nsIFactory);
registrar.unregisterFactory(oldClassID, oldFactory);
--- a/intl/l10n/Localization.jsm
+++ b/intl/l10n/Localization.jsm
@@ -267,17 +267,17 @@ class Localization {
* This method should be called when there's a reason to believe
* that language negotiation or available resources changed.
*/
onLanguageChange() {
this.ctxs = new CachedIterable(this.generateMessages(this.resourceIds));
}
}
-Localization.prototype.QueryInterface = XPCOMUtils.generateQI([
+Localization.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsISupportsWeakReference
]);
/**
* Format the value of a message into a string.
*
* This function is passed as a method to `keysFromContext` and resolve
* a value of a single L10n Entity using provided `MessageContext`.
--- a/js/xpconnect/loader/XPCOMUtils.jsm
+++ b/js/xpconnect/loader/XPCOMUtils.jsm
@@ -497,17 +497,17 @@ var XPCOMUtils = {
var factory = component.prototype._xpcom_factory;
if (!factory) {
factory = {
createInstance: function(outer, iid) {
if (outer)
throw Cr.NS_ERROR_NO_AGGREGATION;
return (new component()).QueryInterface(iid);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
}
}
return factory;
},
/**
* Allows you to fake a relative import. Expects the global object from the
* module that's calling us, and the relative filename that we wish to import.
@@ -538,32 +538,32 @@ var XPCOMUtils = {
if (this._instance === null) {
this._instance = new aServiceConstructor();
}
return this._instance.QueryInterface(aIID);
},
lockFactory: function XPCU_SF_lockFactory(aDoLock) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
};
},
/**
* Defines a non-writable property on an object.
*/
defineConstant: function XPCOMUtils__defineConstant(aObj, aName, aValue) {
Object.defineProperty(aObj, aName, {
value: aValue,
enumerable: true,
writable: false
});
},
};
-var XPCU_lazyPreferenceObserverQI = XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]);
+var XPCU_lazyPreferenceObserverQI = ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]);
ChromeUtils.defineModuleGetter(this, "Services",
"resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyServiceGetter(XPCOMUtils, "categoryManager",
"@mozilla.org/categorymanager;1",
"nsICategoryManager");
--- a/js/xpconnect/tests/chrome/test_bug799348.xul
+++ b/js/xpconnect/tests/chrome/test_bug799348.xul
@@ -18,17 +18,17 @@ https://bugzilla.mozilla.org/show_bug.cg
<script type="application/javascript">
<![CDATA[
/** Test for Bug 799348 **/
SimpleTest.waitForExplicitFinish();
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
gCalledOnload = false;
var myObserver = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
observe: function(win, topic, data) {
if (topic == "domwindowopened") {
ok(!gCalledOnload, "domwindowopened notification fired before onload");
win.addEventListener("load", function(evt) {
gCalledOnload = true;
win.close();
}, false);
} else if (topic == "domwindowclosed") {
--- a/js/xpconnect/tests/chrome/test_nsScriptErrorWithStack.html
+++ b/js/xpconnect/tests/chrome/test_nsScriptErrorWithStack.html
@@ -17,17 +17,17 @@
function failingStack() {
nestedFunction();
}
function nestedFunction() {
doesntExistsAndThrow();
}
var TestObserver = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
observe: function test_observe(aSubject)
{
if (!(aSubject instanceof Ci.nsIScriptError)) {
return;
}
dump("stack: "+aSubject.stack+"\n");
--- a/js/xpconnect/tests/components/js/xpctest_attributes.js
+++ b/js/xpconnect/tests/components/js/xpctest_attributes.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function TestObjectReadWrite() {}
TestObjectReadWrite.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci["nsIXPCTestObjectReadWrite"]]),
+ QueryInterface: ChromeUtils.generateQI([Ci["nsIXPCTestObjectReadWrite"]]),
contractID: "@mozilla.org/js/xpc/test/js/ObjectReadWrite;1",
classID: Components.ID("{8ff41d9c-66e9-4453-924a-7d8de0a5e966}"),
/* nsIXPCTestObjectReadWrite */
stringProperty: "XPConnect Read-Writable String",
booleanProperty: true,
shortProperty: 32767,
longProperty: 2147483647,
@@ -23,17 +23,17 @@ TestObjectReadWrite.prototype = {
timeProperty: -1
};
function TestObjectReadOnly() {}
TestObjectReadOnly.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci["nsIXPCTestObjectReadOnly"]]),
+ QueryInterface: ChromeUtils.generateQI([Ci["nsIXPCTestObjectReadOnly"]]),
contractID: "@mozilla.org/js/xpc/test/js/ObjectReadOnly;1",
classID: Components.ID("{916c4247-253d-4ed0-a425-adfedf53ecc8}"),
/* nsIXPCTestObjectReadOnly */
strReadOnly: "XPConnect Read-Only String",
boolReadOnly: true,
shortReadOnly: 32767,
longReadOnly: 2147483647,
--- a/js/xpconnect/tests/components/js/xpctest_bug809674.js
+++ b/js/xpconnect/tests/components/js/xpctest_bug809674.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function TestBug809674() {}
TestBug809674.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci["nsIXPCTestBug809674"]]),
+ QueryInterface: ChromeUtils.generateQI([Ci["nsIXPCTestBug809674"]]),
contractID: "@mozilla.org/js/xpc/test/js/Bug809674;1",
classID: Components.ID("{2df46559-da21-49bf-b863-0d7b7bbcbc73}"),
/* nsIXPCTestBug809674 */
jsvalProperty: {},
};
--- a/js/xpconnect/tests/components/js/xpctest_interfaces.js
+++ b/js/xpconnect/tests/components/js/xpctest_interfaces.js
@@ -2,43 +2,43 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function TestInterfaceA() {}
TestInterfaceA.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci["nsIXPCTestInterfaceA"]]),
+ QueryInterface: ChromeUtils.generateQI([Ci["nsIXPCTestInterfaceA"]]),
contractID: "@mozilla.org/js/xpc/test/js/TestInterfaceA;1",
classID: Components.ID("{3c8fd2f5-970c-42c6-b5dd-cda1c16dcfd8}"),
/* nsIXPCTestInterfaceA */
name: "TestInterfaceADefaultName"
};
function TestInterfaceB() {}
TestInterfaceB.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci["nsIXPCTestInterfaceB"]]),
+ QueryInterface: ChromeUtils.generateQI([Ci["nsIXPCTestInterfaceB"]]),
contractID: "@mozilla.org/js/xpc/test/js/TestInterfaceB;1",
classID: Components.ID("{ff528c3a-2410-46de-acaa-449aa6403a33}"),
/* nsIXPCTestInterfaceA */
name: "TestInterfaceADefaultName"
};
function TestInterfaceAll() {}
TestInterfaceAll.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci["nsIXPCTestInterfaceA"],
- Ci["nsIXPCTestInterfaceB"],
- Ci["nsIXPCTestInterfaceC"]]),
+ QueryInterface: ChromeUtils.generateQI([Ci["nsIXPCTestInterfaceA"],
+ Ci["nsIXPCTestInterfaceB"],
+ Ci["nsIXPCTestInterfaceC"]]),
contractID: "@mozilla.org/js/xpc/test/js/TestInterfaceAll;1",
classID: Components.ID("{90ec5c9e-f6da-406b-9a38-14d00f59db76}"),
/* nsIXPCTestInterfaceA / nsIXPCTestInterfaceB */
name: "TestInterfaceAllDefaultName",
/* nsIXPCTestInterfaceC */
someInteger: 42
--- a/js/xpconnect/tests/components/js/xpctest_params.js
+++ b/js/xpconnect/tests/components/js/xpctest_params.js
@@ -35,17 +35,17 @@ function f_size_and_iid(aSize, aIID, a,
// Now that we've reduced the problem to one dependent variable, use f_is.
return f_is(aSize, a, bSize, b, rvSize);
}
TestParams.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci["nsIXPCTestParams"]]),
+ QueryInterface: ChromeUtils.generateQI([Ci["nsIXPCTestParams"]]),
contractID: "@mozilla.org/js/xpc/test/js/Params;1",
classID: Components.ID("{e3b86f4e-49c0-487c-a2b0-3a986720a044}"),
/* nsIXPCTestParams */
testBoolean: f,
testOctet: f,
testShort: f,
testLong: f,
--- a/js/xpconnect/tests/components/js/xpctest_returncode_child.js
+++ b/js/xpconnect/tests/components/js/xpctest_returncode_child.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function TestReturnCodeChild() {}
TestReturnCodeChild.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci["nsIXPCTestReturnCodeChild"]]),
+ QueryInterface: ChromeUtils.generateQI([Ci["nsIXPCTestReturnCodeChild"]]),
contractID: "@mozilla.org/js/xpc/test/js/ReturnCodeChild;1",
classID: Components.ID("{38dd78aa-467f-4fad-8dcf-4383a743e235}"),
doIt(behaviour) {
switch (behaviour) {
case Ci.nsIXPCTestReturnCodeChild.CHILD_SHOULD_THROW:
throw(new Error("a requested error"));
case Ci.nsIXPCTestReturnCodeChild.CHILD_SHOULD_RETURN_SUCCESS:
--- a/js/xpconnect/tests/components/js/xpctest_utils.js
+++ b/js/xpconnect/tests/components/js/xpctest_utils.js
@@ -3,15 +3,15 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function TestUtils() {}
TestUtils.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci["nsIXPCTestUtils"]]),
+ QueryInterface: ChromeUtils.generateQI([Ci["nsIXPCTestUtils"]]),
contractID: "@mozilla.org/js/xpc/test/js/TestUtils;1",
classID: Components.ID("{e86573c4-a384-441a-8c92-7b99e8575b28}"),
doubleWrapFunction(fun) { return fun }
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TestUtils]);
--- a/js/xpconnect/tests/unit/component-blob.js
+++ b/js/xpconnect/tests/unit/component-blob.js
@@ -65,13 +65,13 @@ BlobComponent.prototype =
return interfaces;
},
getScriptableHelper: function getScriptableHelper() {
return null;
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIClassInfo])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIClassInfo])
};
var gComponentsArray = [BlobComponent];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(gComponentsArray);
--- a/js/xpconnect/tests/unit/component-file.js
+++ b/js/xpconnect/tests/unit/component-file.js
@@ -96,13 +96,13 @@ FileComponent.prototype =
return interfaces;
},
getScriptableHelper: function getScriptableHelper() {
return null;
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIClassInfo])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIClassInfo])
};
var gComponentsArray = [FileComponent];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(gComponentsArray);
--- a/js/xpconnect/tests/unit/component_import.js
+++ b/js/xpconnect/tests/unit/component_import.js
@@ -66,17 +66,17 @@ BarComponent.prototype =
return interfaces;
},
getScriptableHelper: function getScriptableHelper() {
return null;
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIClassInfo])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIClassInfo])
};
const Assert = {
ok(cond, text) {
// we don't have the test harness' utilities in this scope, so we need this
// little helper. In the failure case, the exception is propagated to the
// caller in the main run_test() function, and the test fails.
if (!cond)
--- a/js/xpconnect/tests/unit/test_xpcomutils.js
+++ b/js/xpconnect/tests/unit/test_xpcomutils.js
@@ -12,17 +12,17 @@ ChromeUtils.import("resource://gre/modul
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
////////////////////////////////////////////////////////////////////////////////
//// Tests
add_test(function test_generateQI_string_names()
{
var x = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIClassInfo,
"nsIObserver"
])
};
try {
x.QueryInterface(Ci.nsIClassInfo);
} catch(e) {
@@ -42,17 +42,17 @@ add_test(function test_generateQI_string
add_test(function test_generateCI()
{
const classID = Components.ID("562dae2e-7cff-432b-995b-3d4c03fa2b89");
const classDescription = "generateCI test component";
const flags = Ci.nsIClassInfo.DOM_OBJECT;
var x = {
- QueryInterface: XPCOMUtils.generateQI([]),
+ QueryInterface: ChromeUtils.generateQI([]),
classInfo: XPCOMUtils.generateCI({classID: classID,
interfaces: [],
flags: flags,
classDescription: classDescription})
};
try {
var ci = x.QueryInterface(Ci.nsIClassInfo);
@@ -217,17 +217,17 @@ add_test(function test_generateSingleton
{
const XPCCOMPONENT_CONTRACTID = "@mozilla.org/singletonComponentTest;1";
const XPCCOMPONENT_CID = Components.ID("{31031c36-5e29-4dd9-9045-333a5d719a3e}");
function XPCComponent() {}
XPCComponent.prototype = {
classID: XPCCOMPONENT_CID,
_xpcom_factory: XPCOMUtils.generateSingletonFactory(XPCComponent),
- QueryInterface: XPCOMUtils.generateQI([])
+ QueryInterface: ChromeUtils.generateQI([])
};
let NSGetFactory = XPCOMUtils.generateNSGetFactory([XPCComponent]);
let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
registrar.registerFactory(
XPCCOMPONENT_CID,
"XPCComponent",
XPCCOMPONENT_CONTRACTID,
NSGetFactory(XPCCOMPONENT_CID)
--- a/layout/tools/recording/recording-cmdline.js
+++ b/layout/tools/recording/recording-cmdline.js
@@ -12,17 +12,17 @@ const nsISupportsString = C
const nsIWindowWatcher = Ci.nsIWindowWatcher;
function RecordingCmdLineHandler() {}
RecordingCmdLineHandler.prototype =
{
classID: Components.ID('{86FB70EC-90FF-45AD-A1C1-F77D3C1184E9}'),
/* nsISupports */
- QueryInterface: XPCOMUtils.generateQI([nsICommandLineHandler]),
+ QueryInterface: ChromeUtils.generateQI([nsICommandLineHandler]),
/* nsICommandLineHandler */
handle : function handler_handle(cmdLine) {
var args = { };
args.wrappedJSObject = args;
try {
var uristr = cmdLine.handleFlagWithParam("recording", false);
if (uristr == null)
--- a/mobile/android/chrome/content/aboutAccounts.js
+++ b/mobile/android/chrome/content/aboutAccounts.js
@@ -107,19 +107,17 @@ var wrapper = {
retry: function() {
deferTransitionToRemoteAfterLoaded();
let webNav = this.iframe.frameLoader.docShell.QueryInterface(Ci.nsIWebNavigation);
webNav.loadURI(this.url, Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_HISTORY, null, null, null);
},
iframeListener: {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference,
- Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener, Ci.nsISupportsWeakReference]),
onStateChange: function(aWebProgress, aRequest, aState, aStatus) {
let failure = false;
// Captive portals sometimes redirect users
if ((aState & Ci.nsIWebProgressListener.STATE_REDIRECTING)) {
failure = true;
} else if ((aState & Ci.nsIWebProgressListener.STATE_STOP)) {
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3436,17 +3436,17 @@ var DesktopUserAgent = {
},
};
function nsBrowserAccess() {
}
nsBrowserAccess.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIBrowserDOMWindow]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIBrowserDOMWindow]),
_getBrowser: function _getBrowser(aURI, aOpener, aWhere, aFlags, aTriggeringPrincipal) {
let isExternal = !!(aFlags & Ci.nsIBrowserDOMWindow.OPEN_EXTERNAL);
if (isExternal && aURI && aURI.schemeIs("chrome"))
return null;
let loadflags = isExternal ?
Ci.nsIWebNavigation.LOAD_FLAGS_FROM_EXTERNAL :
@@ -4798,17 +4798,17 @@ Tab.prototype = {
// nsIBrowserTab
get window() {
if (!this.browser)
return null;
return this.browser.contentWindow;
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISHistoryListener,
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
Ci.nsIBrowserTab
])
};
--- a/mobile/android/components/AboutRedirector.js
+++ b/mobile/android/components/AboutRedirector.js
@@ -66,17 +66,17 @@ var modules = {
accounts: {
uri: "chrome://browser/content/aboutAccounts.xhtml",
privileged: true
},
};
function AboutRedirector() {}
AboutRedirector.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
classID: Components.ID("{322ba47e-7047-4f71-aebf-cb7d69325cd9}"),
_getModuleInfo: function(aURI) {
let moduleName = aURI.pathQueryRef.replace(/[?#].*/, "").toLowerCase();
return modules[moduleName];
},
// nsIAboutModule
--- a/mobile/android/components/AddonUpdateService.js
+++ b/mobile/android/components/AddonUpdateService.js
@@ -26,17 +26,17 @@ const PREF_ADDON_UPDATE_INTERVAL = "exte
var gNeedsRestart = false;
function AddonUpdateService() {}
AddonUpdateService.prototype = {
classDescription: "Add-on auto-update management",
classID: Components.ID("{93c8824c-9b87-45ae-bc90-5b82a1e4d877}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback]),
notify: function aus_notify(aTimer) {
if (aTimer && !Services.prefs.getBoolPref(PREF_ADDON_UPDATE_ENABLED, true))
return;
// If we already auto-upgraded and installed new versions, ignore this check
if (gNeedsRestart)
return;
--- a/mobile/android/components/BlocklistPrompt.js
+++ b/mobile/android/components/BlocklistPrompt.js
@@ -46,12 +46,12 @@ BlocklistPrompt.prototype = {
for (let i = 0; i < aAddons.length; i++) {
if (aAddons[i].item instanceof Ci.nsIPluginTag)
aAddons[i].item.disabled = true;
else
aAddons[i].item.userDisabled = true;
}
},
classID: Components.ID("{4e6ea350-b09a-11df-94e2-0800200c9a66}"),
- QueryInterface: XPCOMUtils.generateQI([])
+ QueryInterface: ChromeUtils.generateQI([])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([BlocklistPrompt]);
--- a/mobile/android/components/BrowserCLH.js
+++ b/mobile/android/components/BrowserCLH.js
@@ -67,17 +67,17 @@ BrowserCLH.prototype = {
GeckoViewUtils.addLazyGetter(this, "InputWidgetHelper", {
module: "resource://gre/modules/InputWidgetHelper.jsm",
});
GeckoViewUtils.addLazyGetter(this, "FormAssistant", {
module: "resource://gre/modules/FormAssistant.jsm",
});
Services.obs.addObserver({
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, Ci.nsIFormSubmitObserver,
]),
notifyInvalidSubmit: (form, element) => {
this.FormAssistant.notifyInvalidSubmit(form, element);
},
}, "invalidformsubmit");
GeckoViewUtils.addLazyGetter(this, "LoginManagerParent", {
@@ -207,16 +207,16 @@ BrowserCLH.prototype = {
// XXXbz what about non-HTML documents??
if (ChromeUtils.getClassName(event.target) == "HTMLDocument") {
this.LoginManagerContent.onPageShow(event, event.target.defaultView.top);
}
}, options);
},
// QI
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
// XPCOMUtils factory
classID: Components.ID("{be623d20-d305-11de-8a39-0800200c9a66}")
};
var components = [ BrowserCLH ];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/mobile/android/components/ColorPicker.js
+++ b/mobile/android/components/ColorPicker.js
@@ -43,12 +43,12 @@ ColorPicker.prototype = {
if (data.button == 0)
aCallback.done(data.color0);
else
aCallback.done(this._initial);
});
},
classID: Components.ID("{430b987f-bb9f-46a3-99a5-241749220b29}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIColorPicker])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIColorPicker])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ColorPicker]);
--- a/mobile/android/components/ContentDispatchChooser.js
+++ b/mobile/android/components/ContentDispatchChooser.js
@@ -7,17 +7,17 @@ ChromeUtils.import("resource://gre/modul
ChromeUtils.import("resource://gre/modules/Messaging.jsm");
function ContentDispatchChooser() {}
ContentDispatchChooser.prototype =
{
classID: Components.ID("5a072a22-1e66-4100-afc1-07aed8b62fc5"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentDispatchChooser]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentDispatchChooser]),
get protoSvc() {
if (!this._protoSvc) {
this._protoSvc = Cc["@mozilla.org/uriloader/external-protocol-service;1"].getService(Ci.nsIExternalProtocolService);
}
return this._protoSvc;
},
--- a/mobile/android/components/ContentPermissionPrompt.js
+++ b/mobile/android/components/ContentPermissionPrompt.js
@@ -23,17 +23,17 @@ const PROMPT_FOR_UNKNOWN = [
"geolocation",
];
function ContentPermissionPrompt() {}
ContentPermissionPrompt.prototype = {
classID: Components.ID("{C6E8C44D-9F39-4AF7-BCC0-76E38A8310F5}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionPrompt]),
handleExistingPermission: function handleExistingPermission(request, type, denyUnknown, callback) {
let result = Services.perms.testExactPermissionFromPrincipal(request.principal, type);
if (result == Ci.nsIPermissionManager.ALLOW_ACTION) {
callback(/* allow */ true);
return true;
}
--- a/mobile/android/components/DirectoryProvider.js
+++ b/mobile/android/components/DirectoryProvider.js
@@ -25,18 +25,18 @@ const WEBAPPS_DIR = "webapps
const SYSTEM_DIST_PATH = `/system/${AppConstants.ANDROID_PACKAGE_NAME}/distribution`;
function DirectoryProvider() {}
DirectoryProvider.prototype = {
classID: Components.ID("{ef0f7a87-c1ee-45a8-8d67-26f586e46a4b}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider,
- Ci.nsIDirectoryServiceProvider2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDirectoryServiceProvider,
+ Ci.nsIDirectoryServiceProvider2]),
getFile: function(prop, persistent) {
if (prop == NS_APP_CACHE_PARENT_DIR) {
let profile = Services.dirsvc.get("ProfD", Ci.nsIFile);
return profile;
} else if (prop == WEBAPPS_DIR) {
// returns the folder that should hold the webapps database file
// For fennec we will store that in the root profile folder so that all
@@ -134,17 +134,17 @@ DirectoryProvider.prototype = {
getFiles: function(prop) {
if (prop != NS_APP_DISTRIBUTION_SEARCH_DIR_LIST)
return null;
let result = [];
this._appendDistroSearchDirs(result);
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISimpleEnumerator]),
hasMoreElements: function() {
return result.length > 0;
},
getNext: function() {
return result.shift();
}
};
},
--- a/mobile/android/components/FilePicker.js
+++ b/mobile/android/components/FilePicker.js
@@ -248,17 +248,17 @@ FilePicker.prototype = {
Ci.nsIFilePicker.returnOK : Ci.nsIFilePicker.returnCancel);
}
delete this._callback;
});
},
getEnumerator: function(files) {
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISimpleEnumerator]),
mFiles: files,
mIndex: 0,
hasMoreElements: function() {
return (this.mIndex < this.mFiles.length);
},
getNext: function() {
if (this.mIndex >= this.mFiles.length) {
throw Cr.NS_ERROR_FAILURE;
@@ -278,12 +278,12 @@ FilePicker.prototype = {
let winUtils = aDomWin.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
winUtils.dispatchEventToChromeOnly(aDomWin, event);
} catch (ex) {
}
},
classID: Components.ID("{18a4e042-7c7c-424b-a583-354e68553a7f}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFilePicker, Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFilePicker, Ci.nsIObserver])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FilePicker]);
--- a/mobile/android/components/FxAccountsPush.js
+++ b/mobile/android/components/FxAccountsPush.js
@@ -151,17 +151,17 @@ FxAccountsPush.prototype = {
message = ChromeUtils.base64URLDecode(data.message, {
// The Push server may append padding.
padding: "ignore",
});
}
return { headers, message };
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
classID: Components.ID("{d1bbb0fd-1d47-4134-9c12-d7b1be20b721}")
};
function urlsafeBase64Encode(key) {
return ChromeUtils.base64URLEncode(new Uint8Array(key), { pad: false });
}
--- a/mobile/android/components/HelperAppDialog.js
+++ b/mobile/android/components/HelperAppDialog.js
@@ -38,17 +38,17 @@ XPCOMUtils.defineLazyGetter(this, "Conte
Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", ContentAreaUtils);
return ContentAreaUtils;
});
function HelperAppLauncherDialog() { }
HelperAppLauncherDialog.prototype = {
classID: Components.ID("{e9d277a0-268a-4ec2-bb8c-10fdf3e44611}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIHelperAppLauncherDialog]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIHelperAppLauncherDialog]),
/**
* Returns false if `url` represents a local or special URL that we don't
* wish to ever download.
*
* Returns true otherwise.
*/
_canDownload: function(url, alreadyResolved = false) {
--- a/mobile/android/components/ImageBlockingPolicy.js
+++ b/mobile/android/components/ImageBlockingPolicy.js
@@ -33,17 +33,17 @@ const OPTION_WIFI_ONLY = 2;
/**
* Content policy for blocking images
*/
function ImageBlockingPolicy() {
Services.obs.addObserver(this, TOPIC_GATHER_TELEMETRY);
}
ImageBlockingPolicy.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy, Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPolicy, Ci.nsIObserver]),
classDescription: "Click-To-Play Image",
classID: Components.ID("{f55f77f9-d33d-4759-82fc-60db3ee0bb91}"),
contractID: "@mozilla.org/browser/blockimages-policy;1",
xpcom_categories: [{category: "content-policy", service: true}],
// nsIContentPolicy interface implementation
shouldLoad: function(contentLocation, loadInfo, mimeTypeGuess) {
let contentType = loadInfo.externalContentPolicyType;
--- a/mobile/android/components/LoginManagerPrompter.js
+++ b/mobile/android/components/LoginManagerPrompter.js
@@ -28,17 +28,17 @@ const PROMPT_UPDATE = 1;
* nsILoginManagerPrompter: Used by Login Manager for saving/changing logins
* found in HTML forms.
*/
function LoginManagerPrompter() {
}
LoginManagerPrompter.prototype = {
classID: Components.ID("97d12931-abe2-11df-94e2-0800200c9a66"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsILoginManagerPrompter]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsILoginManagerPrompter]),
_factory: null,
_window: null,
_debug: false, // mirrors signon.debug
__strBundle: null, // String bundle for L10N
get _strBundle() {
if (!this.__strBundle) {
--- a/mobile/android/components/NSSDialogService.js
+++ b/mobile/android/components/NSSDialogService.js
@@ -11,17 +11,17 @@ ChromeUtils.defineModuleGetter(this, "Pr
// -----------------------------------------------------------------------
// NSS Dialog Service
// -----------------------------------------------------------------------
function NSSDialogs() { }
NSSDialogs.prototype = {
classID: Components.ID("{cbc08081-49b6-4561-9c18-a7707a50bda1}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICertificateDialogs, Ci.nsIClientAuthDialogs]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICertificateDialogs, Ci.nsIClientAuthDialogs]),
/**
* Escapes the given input via HTML entity encoding. Used to prevent HTML
* injection when the input is to be placed inside an HTML body, but not in
* any other context.
*
* @param {String} input The input to interpret as a plain string.
* @returns {String} The escaped input.
--- a/mobile/android/components/PersistentNotificationHandler.js
+++ b/mobile/android/components/PersistentNotificationHandler.js
@@ -15,17 +15,17 @@ XPCOMUtils.defineLazyServiceGetter(this,
XPCOMUtils.defineLazyServiceGetter(this, "serviceWorkerManager",
"@mozilla.org/serviceworkers/manager;1",
"nsIServiceWorkerManager");
function PersistentNotificationHandler() {
}
PersistentNotificationHandler.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
classID: Components.ID("{75390fe7-f8a3-423a-b3b1-258d7eabed40}"),
observe(subject, topic, data) {
if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_DEFAULT) {
ChromeUtils.import("resource://gre/modules/NotificationDB.jsm");
}
const persistentInfo = JSON.parse(data);
--- a/mobile/android/components/PresentationDevicePrompt.js
+++ b/mobile/android/components/PresentationDevicePrompt.js
@@ -25,17 +25,17 @@ function debug(aMsg) {
function PresentationDevicePrompt() {
debug("PresentationDevicePrompt init");
}
PresentationDevicePrompt.prototype = {
classID: kPRESENTATIONDEVICEPROMPT_CID,
contractID: kPRESENTATIONDEVICEPROMPT_CONTRACTID,
classDescription: "Fennec Presentation Device Prompt",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDevicePrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDevicePrompt]),
_devices: [], // Store all available presentation devices
_request: null, // Store the request from presentation api
_getString: function(aName) {
debug("_getString");
if (!this.bundle) {
--- a/mobile/android/components/PresentationRequestUIGlue.js
+++ b/mobile/android/components/PresentationRequestUIGlue.js
@@ -72,12 +72,12 @@ PresentationRequestUIGlue.prototype = {
};
Services.obs.notifyObservers(null,
TOPIC_PRESENTATION_RECEIVER_LAUNCH,
JSON.stringify(data));
});
},
classID: Components.ID("9c550ef7-3ff6-4bd1-9ad1-5a3735b90d21"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationRequestUIGlue])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationRequestUIGlue])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PresentationRequestUIGlue]);
--- a/mobile/android/components/PromptService.js
+++ b/mobile/android/components/PromptService.js
@@ -11,17 +11,17 @@ var gPromptService = null;
function PromptService() {
gPromptService = this;
}
PromptService.prototype = {
classID: Components.ID("{9a61149b-2276-4a0a-b79c-be994ad106cf}"),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIPromptFactory, Ci.nsIPromptService]),
/* ---------- nsIPromptFactory ---------- */
// XXX Copied from nsPrompter.js.
getPrompt: function getPrompt(domWin, iid) {
// This is still kind of dumb; the C++ code delegated to login manager
// here, which in turn calls back into us via nsIPromptService.
if (iid.equals(Ci.nsIAuthPrompt2) || iid.equals(Ci.nsIAuthPrompt)) {
@@ -88,17 +88,17 @@ PromptService.prototype = {
function InternalPrompt(aDomWin) {
this._domWin = aDomWin;
}
InternalPrompt.prototype = {
_domWin: null,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt, Ci.nsIAuthPrompt, Ci.nsIAuthPrompt2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt, Ci.nsIAuthPrompt, Ci.nsIAuthPrompt2]),
/* ---------- internal methods ---------- */
_getPrompt: function _getPrompt(aTitle, aText, aButtons, aCheckMsg, aCheckState) {
let p = new Prompt({
window: this._domWin,
title: aTitle,
message: aText,
buttons: aButtons || [
@@ -488,17 +488,17 @@ InternalPrompt.prototype = {
let cancelable = null;
try {
// If the user submits a login but it fails, we need to remove the
// notification bar that was displayed. Conveniently, the user will
// be prompted for authentication again, which brings us here.
// this._removeLoginNotifications();
cancelable = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
callback: aCallback,
context: aContext,
cancel: function() {
this.callback.onAuthCancelled(this.context, false);
this.callback = null;
this.context = null;
}
};
@@ -812,34 +812,34 @@ XPCOMUtils.defineLazyGetter(PromptUtils,
// Factory for wrapping nsIAuthPrompt interfaces to make them usable via an nsIAuthPrompt2 interface.
// XXX Copied from nsPrompter.js.
function AuthPromptAdapterFactory() {
}
AuthPromptAdapterFactory.prototype = {
classID: Components.ID("{80dae1e9-e0d2-4974-915f-f97050fa8068}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPromptAdapterFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAuthPromptAdapterFactory]),
/* ---------- nsIAuthPromptAdapterFactory ---------- */
createAdapter: function(aPrompt) {
return new AuthPromptAdapter(aPrompt);
}
};
// Takes an nsIAuthPrompt implementation, wraps it with a nsIAuthPrompt2 shell.
// XXX Copied from nsPrompter.js.
function AuthPromptAdapter(aPrompt) {
this.prompt = aPrompt;
}
AuthPromptAdapter.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAuthPrompt2]),
prompt: null,
/* ---------- nsIAuthPrompt2 ---------- */
promptAuth: function(aChannel, aLevel, aAuthInfo, aCheckLabel, aCheckValue) {
let message = PromptUtils.makeDialogText(aChannel, aAuthInfo);
let [username, password] = PromptUtils.getAuthInfo(aAuthInfo);
--- a/mobile/android/components/SessionStore.js
+++ b/mobile/android/components/SessionStore.js
@@ -57,19 +57,19 @@ function sendEvent(browser, event) {
let evt = new Event(event, {"bubbles": true, "cancelable": false});
browser.dispatchEvent(evt);
}
SessionStore.prototype = {
classID: Components.ID("{8c1f07d6-cba3-4226-a315-8bd43d67d032}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISessionStore,
- Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISessionStore,
+ Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
_windows: {},
_lastSaveTime: 0,
_lastQueuedSaveTime: 0,
_lastBackupTime: 0,
_interval: 10000,
_backupInterval: 120000, // 2 minutes
_maxTabsUndo: 5,
--- a/mobile/android/components/Snippets.js
+++ b/mobile/android/components/Snippets.js
@@ -409,17 +409,17 @@ function loadHomePanelsBanner() {
UITelemetry.addEvent("cancel.1", "banner", null, "firstrun-homepage");
}
});
}
function Snippets() {}
Snippets.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsITimerCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsITimerCallback]),
classID: Components.ID("{a78d7e59-b558-4321-a3d6-dffe2f1e76dd}"),
observe: function(subject, topic, data) {
switch(topic) {
case "browser-delayed-startup-finished":
// Add snippets to be cycled through.
if (Services.prefs.getBoolPref("browser.snippets.firstrunHomepage.enabled")) {
loadHomePanelsBanner();
--- a/mobile/android/components/TabSource.js
+++ b/mobile/android/components/TabSource.js
@@ -17,17 +17,17 @@ ChromeUtils.defineModuleGetter(this, "Ev
function TabSource() {
}
TabSource.prototype = {
classID: Components.ID("{5850c76e-b916-4218-b99a-31f004e0a7e7}"),
classDescription: "Fennec Tab Source",
contractID: "@mozilla.org/tab-source-service;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITabSource]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITabSource]),
getTabToStream: function() {
let win = Services.wm.getMostRecentWindow("navigator:browser");
let app = win && win.BrowserApp;
let tabs = app && app.tabs;
if (!tabs || tabs.length == 0) {
Services.console.logStringMessage("ERROR: No tabs");
return null;
--- a/mobile/android/components/XPIDialogService.js
+++ b/mobile/android/components/XPIDialogService.js
@@ -10,17 +10,17 @@ ChromeUtils.defineModuleGetter(this, "Ad
// -----------------------------------------------------------------------
// Web Install Prompt service
// -----------------------------------------------------------------------
function WebInstallPrompt() { }
WebInstallPrompt.prototype = {
classID: Components.ID("{c1242012-27d8-477e-a0f1-0b098ffc329b}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.amIWebInstallPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.amIWebInstallPrompt]),
confirm: function(aBrowser, aURL, aInstalls) {
let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
let prompt = Services.prompt;
let flags = prompt.BUTTON_POS_0 * prompt.BUTTON_TITLE_IS_STRING + prompt.BUTTON_POS_1 * prompt.BUTTON_TITLE_CANCEL;
let title = bundle.GetStringFromName("addonsConfirmInstall.title");
let button = bundle.GetStringFromName("addonsConfirmInstall.install");
--- a/mobile/android/components/geckoview/GeckoViewExternalAppService.js
+++ b/mobile/android/components/geckoview/GeckoViewExternalAppService.js
@@ -14,17 +14,17 @@ ChromeUtils.defineModuleGetter(this, "Ev
"resource://gre/modules/Messaging.jsm");
function ExternalAppService() {
this.wrappedJSObject = this;
}
ExternalAppService.prototype = {
classID: Components.ID("{a89eeec6-6608-42ee-a4f8-04d425992f45}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIExternalHelperAppService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIExternalHelperAppService]),
doContent(mimeType, request, context, forceSave) {
const channel = request.QueryInterface(Ci.nsIChannel);
const mm = context.QueryInterface(Ci.nsIDocShell).tabChild.messageManager;
debug `doContent: uri=${channel.URI.displaySpec}
contentType=${channel.contentType}`;
--- a/mobile/android/components/geckoview/GeckoViewPermission.js
+++ b/mobile/android/components/geckoview/GeckoViewPermission.js
@@ -18,17 +18,17 @@ const PERM_RECORD_AUDIO = "android.permi
function GeckoViewPermission() {
this.wrappedJSObject = this;
}
GeckoViewPermission.prototype = {
classID: Components.ID("{42f3c238-e8e8-4015-9ca2-148723a8afcf}"),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver, Ci.nsIContentPermissionPrompt]),
_appPermissions: {},
/* ---------- nsIObserver ---------- */
observe: function(aSubject, aTopic, aData) {
switch (aTopic) {
case "getUserMedia:ask-device-permission": {
--- a/mobile/android/components/geckoview/GeckoViewPrompt.js
+++ b/mobile/android/components/geckoview/GeckoViewPrompt.js
@@ -16,17 +16,17 @@ XPCOMUtils.defineLazyServiceGetter(this,
function PromptFactory() {
this.wrappedJSObject = this;
}
PromptFactory.prototype = {
classID: Components.ID("{076ac188-23c1-4390-aa08-7ef1f78ca5d9}"),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIPromptFactory, Ci.nsIPromptService]),
handleEvent: function(aEvent) {
switch (aEvent.type) {
case "click":
this._handleClick(aEvent);
break;
case "contextmenu":
@@ -344,17 +344,17 @@ function PromptDelegate(aDomWin) {
}
if (!this._dispatcher) {
this._dispatcher = GeckoViewUtils.getActiveDispatcher();
}
}
PromptDelegate.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt]),
BUTTON_TYPE_POSITIVE: 0,
BUTTON_TYPE_NEUTRAL: 1,
BUTTON_TYPE_NEGATIVE: 2,
/* ---------- internal methods ---------- */
_changeModalState: function(aEntering) {
@@ -684,17 +684,17 @@ PromptDelegate.prototype = {
aCallback.onAuthAvailable(aContext, aAuthInfo);
} else {
aCallback.onAuthCancelled(aContext, /* userCancel */ true);
}
};
this.asyncShowPrompt(this._addCheck(aCheckMsg, aCheckState,
this._getAuthMsg(aChannel, aLevel, aAuthInfo)), callback);
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: function() {
if (responded) {
return;
}
responded = true;
aCallback.onAuthCancelled(aContext, /* userCancel */ false);
}
};
@@ -771,17 +771,17 @@ PromptDelegate.prototype = {
};
function FilePickerDelegate() {
}
FilePickerDelegate.prototype = {
classID: Components.ID("{e4565e36-f101-4bf5-950b-4be0887785a9}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFilePicker]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFilePicker]),
/* ---------- nsIFilePicker ---------- */
init: function(aParent, aTitle, aMode) {
if (aMode === Ci.nsIFilePicker.modeGetFolder ||
aMode === Ci.nsIFilePicker.modeSave) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
}
this._prompt = new PromptDelegate(aParent);
@@ -864,17 +864,17 @@ FilePickerDelegate.prototype = {
return Services.io.newFileURI(this.file);
},
_getEnumerator(aDOMFile) {
if (!this._files) {
throw Cr.NS_ERROR_NOT_AVAILABLE;
}
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISimpleEnumerator]),
_owner: this,
_index: 0,
hasMoreElements: function() {
return this._index < this._owner._files.length;
},
getNext: function() {
let files = this._owner._files;
if (this._index >= files.length) {
@@ -961,17 +961,17 @@ FilePickerDelegate.prototype = {
};
function ColorPickerDelegate() {
}
ColorPickerDelegate.prototype = {
classID: Components.ID("{aa0dd6fc-73dd-4621-8385-c0b377e02cee}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIColorPicker]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIColorPicker]),
init: function(aParent, aTitle, aInitialColor) {
this._prompt = new PromptDelegate(aParent);
this._msg = {
type: "color",
title: aTitle,
value: aInitialColor,
};
--- a/mobile/android/components/geckoview/GeckoViewStartup.js
+++ b/mobile/android/components/geckoview/GeckoViewStartup.js
@@ -11,17 +11,17 @@ XPCOMUtils.defineLazyModuleGetters(this,
});
function GeckoViewStartup() {
}
GeckoViewStartup.prototype = {
classID: Components.ID("{8e993c34-fdd6-432c-967e-f995d888777f}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
/**
* Register resource://android as the APK root.
*
* Consumers can access Android assets using resource://android/assets/FILENAME.
*/
setResourceSubstitutions: function() {
let registry = Cc["@mozilla.org/chrome/chrome-registry;1"].getService(Ci.nsIChromeRegistry);
--- a/mobile/android/modules/NetErrorHelper.jsm
+++ b/mobile/android/modules/NetErrorHelper.jsm
@@ -101,18 +101,18 @@ handlers.searchbutton = {
// Reset the user search to whatever the new search term was
browserWin.BrowserApp.loadURI(uri.spec, undefined, { isSearch: true, userRequested: value });
}
};
handlers.wifi = {
// This registers itself with the nsIObserverService as a weak ref,
// so we have to implement GetWeakReference as well.
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
GetWeakReference: function() {
return Cu.getWeakReference(this);
},
onPageShown: function(browser) {
// If we have a connection, don't bother showing the wifi toggle.
let network = Cc["@mozilla.org/network/network-link-service;1"].getService(Ci.nsINetworkLinkService);
--- a/mobile/android/tests/browser/robocop/testAndroidCastDeviceProvider.js
+++ b/mobile/android/tests/browser/robocop/testAndroidCastDeviceProvider.js
@@ -46,17 +46,17 @@ function TestDescription(aType, aTcpAddr
.createInstance(Ci.nsISupportsCString);
wrapper.data = address;
this.tcpAddress.appendElement(wrapper);
}
this.tcpPort = aTcpPort;
}
TestDescription.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationChannelDescription]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationChannelDescription]),
};
function TestControlChannelListener(aRole) {
log("TestControlChannelListener of " + aRole + " is created.");
this._role = aRole;
this.isNotifyConnectedCalled = new Promise((aResolve) => {
this._isNotifyConnectedCalledResolve = aResolve;
});
@@ -86,17 +86,17 @@ TestControlChannelListener.prototype = {
isOnAnswerCalled: null,
isOnIceCandidateCalled: null,
isNotifyDisconnectedCalled: null,
notifyConnected: function() { this._isNotifyConnectedCalledResolve(); },
notifyDisconnected: function(aReason) { log(this._role + " call disconnect"); this._isNotifyDisconnectedCalledResolve(); },
onOffer: function(aOffer) { this._isOnOfferCalledResolve(); },
onAnswer: function(aAnswer) { this._isOnAnswerCalledResolve(); },
onIceCandidate: function(aCandidate) { this._isOnIceCandidateCalledResolve(); },
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationControlChannelListener])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationControlChannelListener])
};
function deviceManagement() {
do_test_pending();
let provider = Cc[DEVICE_PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
let listener = {
devices: {},
@@ -113,18 +113,18 @@ function deviceManagement() {
updateDevice: function(aDevice) {
this.devices[aDevice.id] = aDevice;
this._isUpdateDeviceCalledResolve();
},
removeDevice: function(aDevice) {
delete this.devices[aDevice.id];
this._isRemoveDeviceCalledResolve();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
count: function() {
let cnt = 0;
for (let key in this.devices) {
if (this.devices.hasOwnProperty(key)) {
++cnt;
}
}
return cnt;
@@ -199,18 +199,18 @@ function presentationLaunchAndTerminate(
let receiverControlChannelListener = new TestControlChannelListener("receiver");
let provider = Cc[DEVICE_PROVIDER_CONTRACT_ID].createInstance(Ci.nsIPresentationDeviceProvider);
let listener = {
devices: {},
addDevice: function(aDevice) { this.devices[aDevice.id] = aDevice; },
updateDevice: function(aDevice) { this.devices[aDevice.id] = aDevice; },
removeDevice: function(aDevice) { delete this.devices[aDevice.id]; },
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPresentationDeviceListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPresentationDeviceListener,
+ Ci.nsISupportsWeakReference]),
onSessionRequest: function(aDeviceId, aUrl, aPresentationId, aControlChannel) {
receiverControlChannel = aControlChannel;
receiverControlChannel.listener = receiverControlChannelListener;
},
onTerminateRequest: function(aDevice, aPresentationId, aControlChannel, aIsFromReceiver) {
receiverControlChannel = aControlChannel;
receiverControlChannel.listener = receiverControlChannelListener;
},
--- a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.js
+++ b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.js
@@ -131,26 +131,26 @@ ListenerWrapper.prototype = {
function nsDNSServiceDiscovery() {
log("nsDNSServiceDiscovery");
this.mdns = new MulticastDNS();
}
nsDNSServiceDiscovery.prototype = {
classID: DNSSERVICEDISCOVERY_CID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIDNSServiceDiscovery]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIDNSServiceDiscovery]),
startDiscovery: function(aServiceType, aListener) {
log("startDiscovery");
let listener = new ListenerWrapper(aListener, this.mdns);
listener.discoveryStarting = true;
this.mdns.startDiscovery(aServiceType, listener);
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: (function() {
if (this.discoveryStarting || this.stopDiscovery) {
this.stopDiscovery = true;
return;
}
this.mdns.stopDiscovery(aServiceType, listener);
}).bind(listener)
};
@@ -158,17 +158,17 @@ nsDNSServiceDiscovery.prototype = {
registerService: function(aServiceInfo, aListener) {
log("registerService");
let listener = new ListenerWrapper(aListener, this.mdns);
listener.registrationStarting = true;
this.mdns.registerService(aServiceInfo, listener);
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel: (function() {
if (this.registrationStarting || this.stopRegistration) {
this.stopRegistration = true;
return;
}
this.mdns.unregisterService(aServiceInfo, listener);
}).bind(listener)
};
--- a/netwerk/protocol/http/UAOverridesBootstrapper.js
+++ b/netwerk/protocol/http/UAOverridesBootstrapper.js
@@ -20,14 +20,14 @@ UAOverridesBootstrapper.prototype = {
observe: function uaob_observe(aSubject, aTopic, aData) {
if (aTopic == "profile-change-net-teardown") {
Services.obs.removeObserver(this, "profile-change-net-teardown");
UserAgentOverrides.uninit();
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
classID: Components.ID("{965b0ca8-155b-11e7-93ae-92361f002671}")
};
const components = [UAOverridesBootstrapper];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/netwerk/protocol/http/UserAgentUpdates.jsm
+++ b/netwerk/protocol/http/UserAgentUpdates.jsm
@@ -268,13 +268,13 @@ var UserAgentUpdates = {
this._applySavedUpdate();
this._lastUpdated = lastUpdated;
}
}
break;
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsITimerCallback,
]),
};
--- a/netwerk/protocol/http/WellKnownOpportunisticUtils.js
+++ b/netwerk/protocol/http/WellKnownOpportunisticUtils.js
@@ -15,17 +15,17 @@ function WellKnownOpportunisticUtils() {
this.mixed = false;
this.lifetime = 0;
}
WellKnownOpportunisticUtils.prototype = {
classID: WELLKNOWNOPPORTUNISTICUTILS_CID,
contractID: WELLKNOWNOPPORTUNISTICUTILS_CONTRACTID,
classDescription: "Well-Known Opportunistic Utils",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWellKnownOpportunisticUtils]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWellKnownOpportunisticUtils]),
verify: function(aJSON, aOrigin, aAlternatePort) {
try {
let obj = JSON.parse(aJSON.toLowerCase());
let ports = obj[aOrigin.toLowerCase()]['tls-ports'];
if (!ports.includes(aAlternatePort)) {
throw "invalid port";
}
--- a/netwerk/test/browser/browser_NetUtil.js
+++ b/netwerk/test/browser/browser_NetUtil.js
@@ -35,18 +35,18 @@ function test_asyncFetchBadCert() {
ok(!Components.isSuccessCode(aStatusCode), "request failed");
ok(aRequest instanceof Ci.nsIHttpChannel, "request is an nsIHttpChannel");
// Now try again with a channel whose notificationCallbacks doesn't suprress errors
let channel = NetUtil.newChannel({
uri: "https://untrusted.example.com",
loadUsingSystemPrincipal: true});
channel.notificationCallbacks = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIProgressEventSink,
- Ci.nsIInterfaceRequestor]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIProgressEventSink,
+ Ci.nsIInterfaceRequestor]),
getInterface: function (aIID) { return this.QueryInterface(aIID); },
onProgress: function () {},
onStatus: function () {}
};
NetUtil.asyncFetch(channel, function (aInputStream, aStatusCode, aRequest) {
ok(!Components.isSuccessCode(aStatusCode), "request failed");
ok(aRequest instanceof Ci.nsIHttpChannel, "request is an nsIHttpChannel");
--- a/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js
+++ b/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js
@@ -53,18 +53,18 @@ CustomProtocolHandler.prototype = {
if (aOuter) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return this.QueryInterface(aIID);
},
lockFactory: function() {},
/** nsISupports */
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIProtocolHandler,
+ Ci.nsIFactory]),
classID: Components.ID("{16d594bc-d9d8-47ae-a139-ea714dc0c35c}")
};
function CustomChannel(aURI, aLoadInfo) {
this.uri = aURI;
this.loadInfo = aLoadInfo;
this._uploadStream = null;
--- a/netwerk/test/unit/client_cert_chooser.js
+++ b/netwerk/test/unit/client_cert_chooser.js
@@ -1,24 +1,24 @@
// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
var Prompter = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt]),
alert: function() {} // Do nothing when asked to show an alert
};
function WindowWatcherService() {}
WindowWatcherService.prototype = {
classID: Components.ID("{01ae923c-81bb-45db-b860-d423b0fc4fe1}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowWatcher]),
getNewPrompter: function() {
return Prompter;
}
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
WindowWatcherService
--- a/netwerk/test/unit/test_1351443-missing-NewChannel2.js
+++ b/netwerk/test/unit/test_1351443-missing-NewChannel2.js
@@ -129,20 +129,20 @@ ProtocolHandler.prototype = {
throw Components.Exception("createInstance no aggregation",
Cr.NS_ERROR_NO_AGGREGATION);
}
return this.QueryInterface(aIID);
},
lockFactory: function() {},
/** nsISupports */
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler,
- Ci.nsIRequest,
- Ci.nsIChannel,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIProtocolHandler,
+ Ci.nsIRequest,
+ Ci.nsIChannel,
+ Ci.nsIFactory]),
classID: Components.ID("{accbaf4a-2fd9-47e7-8aad-8c19fc5265b5}")
};
/**
* Attempt a sync load; we use the stylesheet service to do this for us,
* based on the knowledge that it forces a sync load under the hood.
*/
function run_test()
--- a/netwerk/test/unit/test_about_protocol.js
+++ b/netwerk/test/unit/test_about_protocol.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
var unsafeAboutModule = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
newChannel: function (aURI, aLoadInfo) {
var uri = Services.io.newURI("about:blank");
let chan = Services.io.newChannelFromURIWithLoadInfo(uri, aLoadInfo);
chan.owner = Services.scriptSecurityManager.getSystemPrincipal();
return chan;
},
getURIFlags: function (aURI) {
return Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT;
@@ -23,17 +23,17 @@ var factory = {
createInstance: function(aOuter, aIID) {
if (aOuter)
throw Cr.NS_ERROR_NO_AGGREGATION;
return unsafeAboutModule.QueryInterface(aIID);
},
lockFactory: function(aLock) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
};
function run_test() {
let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
let classID = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator).generateUUID();
registrar.registerFactory(classID, "", "@mozilla.org/network/protocol/about;1?what=unsafe", factory);
let aboutUnsafeChan = NetUtil.newChannel({
--- a/netwerk/test/unit/test_bug1218029.js
+++ b/netwerk/test/unit/test_bug1218029.js
@@ -32,17 +32,17 @@ var tests = [
function execute_test(test) {
let stream = Cc["@mozilla.org/io/string-input-stream;1"].
createInstance(Ci.nsIStringInputStream);
stream.data = test.data;
let channel = {
contentLength: -1,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannel])
};
let chunkIndex = 0;
let observer = {
onStreamComplete: function(loader, context, status, length, data) {
equal(chunkIndex, test.dataChunks.length - 1);
var expectedChunk = test.dataChunks[chunkIndex];
@@ -56,17 +56,17 @@ function execute_test(test) {
var expectedChunk = test.dataChunks[chunkIndex];
equal(length, expectedChunk.length);
equal(String.fromCharCode.apply(null, data), expectedChunk);
consumed.value = test.consume[chunkIndex];
chunkIndex++;
},
QueryInterface:
- XPCOMUtils.generateQI([Ci.nsIIncrementalStreamLoaderObserver])
+ ChromeUtils.generateQI([Ci.nsIIncrementalStreamLoaderObserver])
};
let listener = Cc["@mozilla.org/network/incremental-stream-loader;1"]
.createInstance(Ci.nsIIncrementalStreamLoader);
listener.init(observer);
listener.onStartRequest(channel, null);
var offset = 0;
--- a/netwerk/test/unit/test_bug365133.js
+++ b/netwerk/test/unit/test_bug365133.js
@@ -80,17 +80,17 @@ function storeData() {
var channel = {
URI: url,
contentLength: -1,
pending: true,
isPending: function() {
return this.pending;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannel])
};
converter.onStartRequest(channel, null);
converter.onDataAvailable(channel, null, stream, 0, 0);
channel.pending = false;
converter.onStopRequest(channel, null, Cr.NS_OK);
}
--- a/netwerk/test/unit/test_bug484684.js
+++ b/netwerk/test/unit/test_bug484684.js
@@ -84,17 +84,17 @@ function storeData(status, entry) {
var channel = {
URI: url,
contentLength: -1,
pending: true,
isPending: function() {
return this.pending;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannel])
};
converter.onStartRequest(channel, null);
converter.onDataAvailable(channel, null, stream, 0, 0);
channel.pending = false;
converter.onStopRequest(channel, null, Cr.NS_OK);
}
--- a/netwerk/test/unit/test_bug515583.js
+++ b/netwerk/test/unit/test_bug515583.js
@@ -42,17 +42,17 @@ function storeData(status, entry) {
var channel = {
URI: url,
contentLength: -1,
pending: true,
isPending: function() {
return this.pending;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannel])
};
converter.onStartRequest(channel, null);
converter.onDataAvailable(channel, null, stream, 0, 0);
channel.pending = false;
converter.onStopRequest(channel, null, Cr.NS_OK);
}
--- a/netwerk/test/unit/test_bug543805.js
+++ b/netwerk/test/unit/test_bug543805.js
@@ -62,17 +62,17 @@ function storeData(status, entry) {
var channel = {
URI: url,
contentLength: -1,
pending: true,
isPending: function() {
return this.pending;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannel])
};
converter.onStartRequest(channel, null);
converter.onDataAvailable(channel, null, stream, 0, 0);
channel.pending = false;
converter.onStopRequest(channel, null, Cr.NS_OK);
}
--- a/netwerk/test/unit/test_bug894586.js
+++ b/netwerk/test/unit/test_bug894586.js
@@ -121,20 +121,20 @@ ProtocolHandler.prototype = {
throw Components.Exception("createInstance no aggregation",
Cr.NS_ERROR_NO_AGGREGATION);
}
return this.QueryInterface(aIID);
},
lockFactory: function() {},
/** nsISupports */
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler,
- Ci.nsIRequest,
- Ci.nsIChannel,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIProtocolHandler,
+ Ci.nsIRequest,
+ Ci.nsIChannel,
+ Ci.nsIFactory]),
classID: Components.ID("{16d594bc-d9d8-47ae-a139-ea714dc0c35c}")
};
/**
* Attempt a sync load; we use the stylesheet service to do this for us,
* based on the knowledge that it forces a sync load under the hood.
*/
function run_test()
--- a/netwerk/test/unit/test_synthesized_response.js
+++ b/netwerk/test/unit/test_synthesized_response.js
@@ -34,19 +34,19 @@ var gotOnStatus;
function make_channel(url, body, cb) {
gotOnProgress = false;
gotOnStatus = false;
var chan = NetUtil.newChannel({uri: url, loadUsingSystemPrincipal: true})
.QueryInterface(Ci.nsIHttpChannel);
chan.notificationCallbacks = {
numChecks: 0,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINetworkInterceptController,
- Ci.nsIInterfaceRequestor,
- Ci.nsIProgressEventSink]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINetworkInterceptController,
+ Ci.nsIInterfaceRequestor,
+ Ci.nsIProgressEventSink]),
getInterface: function(iid) {
return this.QueryInterface(iid);
},
onProgress: function(request, context, progress, progressMax) {
gotOnProgress = true;
},
onStatus: function(request, context, status, statusArg) {
gotOnStatus = true;
--- a/netwerk/test/unit/test_udpsocket.js
+++ b/netwerk/test/unit/test_udpsocket.js
@@ -12,17 +12,17 @@ const EMPTY_MESSAGE = "";
add_test(function test_udp_message_raw_data() {
info("test for nsIUDPMessage.rawData");
let socket = Cc["@mozilla.org/network/udp-socket;1"].createInstance(Ci.nsIUDPSocket);
socket.init(-1, true, Services.scriptSecurityManager.getSystemPrincipal());
info("Port assigned : " + socket.port);
socket.asyncListen({
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIUDPSocketListener]),
+ QueryInterface : ChromeUtils.generateQI([Ci.nsIUDPSocketListener]),
onPacketReceived : function(aSocket, aMessage){
let recv_data = String.fromCharCode.apply(null, aMessage.rawData);
Assert.equal(recv_data, HELLO_WORLD);
Assert.equal(recv_data, aMessage.data);
socket.close();
run_next_test();
},
onStopListening: function(aSocket, aStatus){}
@@ -38,17 +38,17 @@ add_test(function test_udp_message_raw_d
add_test(function test_udp_send_stream() {
info("test for nsIUDPSocket.sendBinaryStream");
let socket = Cc["@mozilla.org/network/udp-socket;1"].createInstance(Ci.nsIUDPSocket);
socket.init(-1, true, Services.scriptSecurityManager.getSystemPrincipal());
socket.asyncListen({
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIUDPSocketListener]),
+ QueryInterface : ChromeUtils.generateQI([Ci.nsIUDPSocketListener]),
onPacketReceived : function(aSocket, aMessage){
let recv_data = String.fromCharCode.apply(null, aMessage.rawData);
Assert.equal(recv_data, HELLO_WORLD);
socket.close();
run_next_test();
},
onStopListening: function(aSocket, aStatus){}
});
@@ -61,17 +61,17 @@ add_test(function test_udp_send_stream()
add_test(function test_udp_message_zero_length() {
info("test for nsIUDPMessage with zero length");
let socket = Cc["@mozilla.org/network/udp-socket;1"].createInstance(Ci.nsIUDPSocket);
socket.init(-1, true, Services.scriptSecurityManager.getSystemPrincipal());
info("Port assigned : " + socket.port);
socket.asyncListen({
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIUDPSocketListener]),
+ QueryInterface : ChromeUtils.generateQI([Ci.nsIUDPSocketListener]),
onPacketReceived : function(aSocket, aMessage){
let recv_data = String.fromCharCode.apply(null, aMessage.rawData);
Assert.equal(recv_data, EMPTY_MESSAGE);
Assert.equal(recv_data, aMessage.data);
socket.close();
run_next_test();
},
onStopListening: function(aSocket, aStatus){}
--- a/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js
@@ -65,17 +65,17 @@ const gClientAuthDialogs = {
if (this.state == DialogState.RETURN_CERT_SELECTED) {
selectedIndex.value = 0;
return true;
}
return false;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIClientAuthDialogs])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIClientAuthDialogs])
};
add_task(async function setup() {
let clientAuthDialogsCID =
MockRegistrar.register("@mozilla.org/nsClientAuthDialogs;1",
gClientAuthDialogs);
registerCleanupFunction(() => {
MockRegistrar.unregister(clientAuthDialogsCID);
--- a/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
@@ -70,17 +70,17 @@ const gCertificateDialogs = {
},
viewCert(ctx, cert) {
this.viewCertCallCount++;
Assert.notEqual(cert, null, "Cert to view should not be null");
Assert.equal(cert, this.expectedCert,
"Actual and expected cert should match");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICertificateDialogs])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICertificateDialogs])
};
add_task(async function setup() {
for (let testCase of TEST_CASES) {
testCase.cert = await readCertificate(testCase.certFilename, ",,");
Assert.notEqual(testCase.cert, null,
`'${testCase.certFilename}' should have been read`);
}
--- a/security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js
@@ -61,34 +61,34 @@ const gMockPKCS11ModuleDB = {
toggleFIPSMode() {
throw new Error("not expecting toggleFIPSMode() to be called");
},
get isFIPSEnabled() {
throw new Error("not expecting get isFIPSEnabled() to be called");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPKCS11ModuleDB])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPKCS11ModuleDB])
};
const gMockPromptService = {
alertCallCount: 0,
expectedText: "",
expectedWindow: null,
alert(parent, dialogTitle, text) {
this.alertCallCount++;
Assert.equal(parent, this.expectedWindow,
"alert: Parent should be expected window");
Assert.equal(dialogTitle, null, "alert: Title should be null");
Assert.equal(text, this.expectedText,
"alert: Actual and expected text should match");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptService])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService])
};
var gMockPKCS11CID =
MockRegistrar.register("@mozilla.org/security/pkcs11moduledb;1",
gMockPKCS11ModuleDB);
var gMockPromptServiceCID =
MockRegistrar.register("@mozilla.org/embedcomp/prompt-service;1",
gMockPromptService);
--- a/security/manager/ssl/tests/unit/test_certDB_import.js
+++ b/security/manager/ssl/tests/unit/test_certDB_import.js
@@ -32,17 +32,17 @@ const gCertificateDialogs = {
// We don't test anything that calls this method yet.
ok(false, "getPKCS12FilePassword() should not have been called");
},
viewCert: (ctx, cert) => {
// This shouldn't be called for import methods.
ok(false, "viewCert() should not have been called");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICertificateDialogs])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICertificateDialogs])
};
// Implements nsIInterfaceRequestor. Mostly serves to mock nsIPrompt.
const gInterfaceRequestor = {
alert: (title, text) => {
// We don't test anything that calls this method yet.
ok(false, `alert() should not have been called: ${text}`);
},
--- a/security/manager/ssl/tests/unit/test_certDB_import_pkcs12.js
+++ b/security/manager/ssl/tests/unit/test_certDB_import_pkcs12.js
@@ -54,17 +54,17 @@ let gTestcases = [
expectedAlertRegexp: null,
passwordToUse: TEST_CERT_PASSWORD,
successExpected: true,
},
];
// Mock implementation of nsICertificateDialogs.
const gCertificateDialogs = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICertificateDialogs]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICertificateDialogs]),
getPKCS12FilePassword: (ctx, password) => {
if (gGetPKCS12FilePasswordCalled) {
if (gCurrentTestcase.multiplePasswordPromptsMeans == "cancel") {
return false;
}
ok(false, "getPKCS12FilePassword should be called only once");
}
@@ -72,28 +72,28 @@ const gCertificateDialogs = {
password.value = gCurrentTestcase.passwordToUse;
info("getPKCS12FilePassword() called");
gGetPKCS12FilePasswordCalled = true;
return true;
},
};
const gPrompt = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt]),
alert: (title, text) => {
info(`alert('${text}')`);
ok(gCurrentTestcase.expectingAlert,
"alert() should only be called if we're expecting it");
ok(gCurrentTestcase.expectedAlertRegexp.test(text),
"alert text should match expected message");
},
};
const gPromptFactory = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptFactory]),
getPrompt: (aWindow, aIID) => gPrompt,
};
function doesCertExist(commonName) {
let allCerts = gCertDB.getCerts();
let enumerator = allCerts.getEnumerator();
while (enumerator.hasMoreElements()) {
let cert = enumerator.getNext().QueryInterface(Ci.nsIX509Cert);
--- a/security/manager/ssl/tests/unit/test_certDB_import_with_master_password.js
+++ b/security/manager/ssl/tests/unit/test_certDB_import_with_master_password.js
@@ -32,17 +32,17 @@ const gCertificateDialogs = {
// We don't test anything that calls this method yet.
ok(false, "getPKCS12FilePassword() should not have been called");
},
viewCert: (ctx, cert) => {
// This shouldn't be called for import methods.
ok(false, "viewCert() should not have been called");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICertificateDialogs])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICertificateDialogs])
};
var gMockPrompter = {
passwordToTry: "password",
numPrompts: 0,
// This intentionally does not use arrow function syntax to avoid an issue
// where in the context of the arrow function, |this != gMockPrompter| due to
@@ -56,17 +56,17 @@ var gMockPrompter = {
"Please enter your master password.",
"password prompt text should be as expected");
equal(checkMsg, null, "checkMsg should be null");
ok(this.passwordToTry, "passwordToTry should be non-null");
password.value = this.passwordToTry;
return true;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt]),
// Again with the arrow function issue.
getInterface(iid) {
if (iid.equals(Ci.nsIPrompt)) {
return this;
}
throw new Error(Cr.NS_ERROR_NO_INTERFACE);
--- a/security/manager/ssl/tests/unit/test_js_cert_override_service.js
+++ b/security/manager/ssl/tests/unit/test_js_cert_override_service.js
@@ -34,17 +34,17 @@ const gCertOverrideService = {
clearValidityOverride() {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
isCertUsedForOverrides() {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICertOverrideService])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICertOverrideService])
};
function run_test() {
do_get_profile();
let certOverrideServiceCID =
MockRegistrar.register("@mozilla.org/security/certoverride;1",
gCertOverrideService);
registerCleanupFunction(() => {
--- a/security/manager/ssl/tests/unit/test_password_prompt.js
+++ b/security/manager/ssl/tests/unit/test_password_prompt.js
@@ -25,24 +25,24 @@ var gMockPrompter = {
"Please enter your master password.",
"password prompt text should be as expected");
equal(checkMsg, null, "checkMsg should be null");
ok(this.passwordToTry, "passwordToTry should be non-null");
password.value = this.passwordToTry;
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.
var gWindowWatcher = {
getNewPrompter: () => gMockPrompter,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowWatcher]),
};
function run_test() {
do_get_profile();
let windowWatcherCID =
MockRegistrar.register("@mozilla.org/embedcomp/window-watcher;1",
gWindowWatcher);
--- a/security/manager/ssl/tests/unit/test_pkcs11_safe_mode.js
+++ b/security/manager/ssl/tests/unit/test_pkcs11_safe_mode.js
@@ -14,17 +14,17 @@ function run_test() {
let xulRuntime = {
inSafeMode: true,
logConsoleErrors: true,
OS: "XPCShell",
XPCOMABI: "noarch-spidermonkey",
invalidateCachesOnRestart: function invalidateCachesOnRestart() {
// Do nothing
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIXULRuntime])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIXULRuntime])
};
let xulRuntimeFactory = {
createInstance(outer, iid) {
if (outer != null) {
throw new Error(Cr.NS_ERROR_NO_AGGREGATION);
}
return xulRuntime.QueryInterface(iid);
--- a/security/manager/ssl/tests/unit/test_sdr.js
+++ b/security/manager/ssl/tests/unit/test_sdr.js
@@ -13,17 +13,17 @@ let gSetPasswordShownCount = 0;
const gTokenPasswordDialogs = {
setPassword(ctx, tokenName) {
gSetPasswordShownCount++;
info(`setPassword() called; shown ${gSetPasswordShownCount} times`);
info(`tokenName: ${tokenName}`);
return false; // Returning false means "the user didn't cancel".
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITokenPasswordDialogs])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITokenPasswordDialogs])
};
add_task(function testEncryptString() {
let sdr = Cc["@mozilla.org/security/sdr;1"]
.getService(Ci.nsISecretDecoderRing);
// Test valid inputs for encryptString() and decryptString().
let inputs = [
--- a/security/manager/ssl/tests/unit/test_sdr_preexisting_with_password.js
+++ b/security/manager/ssl/tests/unit/test_sdr_preexisting_with_password.js
@@ -30,24 +30,24 @@ var gMockPrompter = {
"Please enter your master password.",
"password prompt text should be as expected");
equal(checkMsg, null, "checkMsg should be null");
ok(this.passwordToTry, "passwordToTry should be non-null");
password.value = this.passwordToTry;
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.
var gWindowWatcher = {
getNewPrompter: () => gMockPrompter,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowWatcher]),
};
function run_test() {
let windowWatcherCID =
MockRegistrar.register("@mozilla.org/embedcomp/window-watcher;1",
gWindowWatcher);
registerCleanupFunction(() => {
MockRegistrar.unregister(windowWatcherCID);
--- a/security/manager/tools/getHSTSPreloadList.js
+++ b/security/manager/tools/getHSTSPreloadList.js
@@ -157,18 +157,18 @@ RedirectAndAuthStopper.prototype = {
asyncPromptAuth(channel, callback, context, level, authInfo) {
throw new Error(Cr.NS_ERROR_NOT_IMPLEMENTED);
},
getInterface(iid) {
return this.QueryInterface(iid);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannelEventSink,
- Ci.nsIAuthPrompt2])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannelEventSink,
+ Ci.nsIAuthPrompt2])
};
function getHSTSStatus(host, resultList) {
let req = new XMLHttpRequest();
let inResultList = false;
let uri = "https://" + host.name + "/";
req.open("GET", uri, true);
req.setRequestHeader("X-Automated-Tool",
--- a/services/common/async.js
+++ b/services/common/async.js
@@ -147,17 +147,17 @@ var Async = {
* Allows consumers to enqueue asynchronous callbacks to be called in order.
* Typically this is used when providing a callback to a caller that doesn't
* await on promises.
*/
class AsyncQueueCaller {
constructor(log) {
this._log = log;
this._queue = Promise.resolve();
- this.QueryInterface = XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]);
+ this.QueryInterface = ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]);
}
/**
* /!\ Never await on another function that calls enqueueCall /!\
* on the same queue or we will deadlock.
*/
enqueueCall(func) {
this._queue = (async () => {
--- a/services/common/observers.js
+++ b/services/common/observers.js
@@ -103,17 +103,17 @@ var Observers = {
function Observer(topic, callback, thisObject) {
this.topic = topic;
this.callback = callback;
this.thisObject = thisObject;
}
Observer.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
// Extract the wrapped object for subjects that are one of our wrappers
// around a JS object. This way we support both wrapped subjects created
// using this module and those that are real XPCOM components.
if (subject && typeof subject == "object" &&
("wrappedJSObject" in subject) &&
("observersModuleSubjectWrapper" in subject.wrappedJSObject))
subject = subject.wrappedJSObject.object;
@@ -133,12 +133,12 @@ function Subject(object) {
// Double-wrap the object and set a property identifying the wrappedJSObject
// as one of our wrappers to distinguish between subjects that are one of our
// wrappers (which we should unwrap when notifying our observers) and those
// that are real JS XPCOM components (which we should pass through unaltered).
this.wrappedJSObject = { observersModuleSubjectWrapper: true, object };
}
Subject.prototype = {
- QueryInterface: XPCOMUtils.generateQI([]),
+ QueryInterface: ChromeUtils.generateQI([]),
getScriptableHelper() {},
getInterfaces() {}
};
--- a/services/common/rest.js
+++ b/services/common/rest.js
@@ -89,17 +89,17 @@ function RESTRequest(uri) {
this._log = Log.repository.getLogger(this._logName);
this._log.manageLevelFromPref("services.common.log.logger.rest.request");
}
RESTRequest.prototype = {
_logName: "Services.Common.RESTRequest",
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIBadCertListener2,
Ci.nsIInterfaceRequestor,
Ci.nsIChannelEventSink
]),
/** Public API: **/
/**
--- a/services/common/tests/unit/head_helpers.js
+++ b/services/common/tests/unit/head_helpers.js
@@ -133,17 +133,17 @@ function ensureThrows(func) {
/**
* Proxy auth helpers.
*/
/**
* Fake a PAC to prompt a channel replacement.
*/
var PACSystemSettings = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISystemProxySettings]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISystemProxySettings]),
// Replace this URI for each test to avoid caching. We want to ensure that
// each test gets a completely fresh setup.
mainThreadOnly: true,
PACURI: null,
getProxyForURI: function getProxyForURI(aURI) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
}
--- a/services/crypto/modules/WeaveCrypto.js
+++ b/services/crypto/modules/WeaveCrypto.js
@@ -27,18 +27,18 @@ function WeaveCrypto() {
WeaveCrypto.prototype = {
prefBranch: null,
debug: true, // services.sync.log.cryptoDebug
observer: {
_self: null,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
let self = this._self;
self.log("Observed " + topic + " topic.");
if (topic == "nsPref:changed") {
self.debug = self.prefBranch.getBoolPref("cryptoDebug");
}
}
--- a/services/fxaccounts/FxAccountsProfile.jsm
+++ b/services/fxaccounts/FxAccountsProfile.jsm
@@ -132,13 +132,13 @@ this.FxAccountsProfile.prototype = {
log.error("Background refresh of profile failed", err);
});
} else {
log.trace("not checking freshness of profile as it remains recent");
}
return profileCache.profile;
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
]),
};
--- a/services/fxaccounts/FxAccountsPush.js
+++ b/services/fxaccounts/FxAccountsPush.js
@@ -42,17 +42,17 @@ FxAccountsPushService.prototype = {
fxAccounts: null,
/**
* Component ID of this service, helps register this component.
*/
classID: Components.ID("{1b7db999-2ecd-4abf-bb95-a726896798ca}"),
/**
* Register used interfaces in this service
*/
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
/**
* Initialize the service and register all the required observers.
*
* @param [options]
*/
initialize(options) {
if (this._initialized) {
return false;
--- a/services/fxaccounts/tests/browser/head.js
+++ b/services/fxaccounts/tests/browser/head.js
@@ -21,18 +21,18 @@ function waitForDocLoadComplete(aBrowser
aBrowser.removeProgressListener(this);
waitForDocLoadComplete.listeners.delete(this);
let chan = req.QueryInterface(Ci.nsIChannel);
info("Browser loaded " + chan.originalURI.spec);
resolve();
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference])
};
aBrowser.addProgressListener(listener);
waitForDocLoadComplete.listeners.add(listener);
info("Waiting for browser load");
});
}
function setupMockAlertsService() {
--- a/services/fxaccounts/tests/xpcshell/test_accounts.js
+++ b/services/fxaccounts/tests/xpcshell/test_accounts.js
@@ -1485,17 +1485,17 @@ function getTestUser(name) {
verified: false
};
}
function makeObserver(aObserveTopic, aObserveFunc) {
let observer = {
// nsISupports provides type management in C++
// nsIObserver is to be an observer
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
observe(aSubject, aTopic, aData) {
log.debug("observed " + aTopic + " " + aData);
if (aTopic == aObserveTopic) {
removeMe();
aObserveFunc(aSubject, aTopic, aData);
}
}
--- a/services/sync/Weave.js
+++ b/services/sync/Weave.js
@@ -60,18 +60,18 @@ XPCOMUtils.defineLazyPreferenceGetter(th
*/
function WeaveService() {
this.wrappedJSObject = this;
this.ready = false;
}
WeaveService.prototype = {
classID: Components.ID("{74b89fb0-f200-4ae8-a3ec-dd164117f6de}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
ensureLoaded() {
ChromeUtils.import("resource://services-sync/main.js");
// Side-effect of accessing the service is that it is instantiated.
Weave.Service;
},
@@ -126,18 +126,18 @@ WeaveService.prototype = {
return !!syncUsername && Services.prefs.getBoolPref("identity.fxaccounts.enabled");
}
};
function AboutWeaveLog() {}
AboutWeaveLog.prototype = {
classID: Components.ID("{d28f8a0b-95da-48f4-b712-caf37097be41}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule,
+ Ci.nsISupportsWeakReference]),
getURIFlags(aURI) {
return 0;
},
newChannel(aURI, aLoadInfo) {
let dir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
let uri = Services.io.newFileURI(dir);
--- a/services/sync/modules/engines/bookmarks.js
+++ b/services/sync/modules/engines/bookmarks.js
@@ -1369,17 +1369,17 @@ BookmarksTracker.prototype = {
}
break;
case "bookmarks-restore-failed":
this._log.debug("Tracking all items on failed import.");
break;
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver,
Ci.nsINavBookmarkObserver_MOZILLA_1_9_1_ADDITIONS,
Ci.nsISupportsWeakReference
]),
/* Every add/remove/change will trigger a sync for MULTI_DEVICE (except in
a batch operation, where we do it at the end of the batch) */
_upScore: function BMT__upScore() {
--- a/services/sync/modules/engines/forms.js
+++ b/services/sync/modules/engines/forms.js
@@ -208,17 +208,17 @@ FormStore.prototype = {
};
function FormTracker(name, engine) {
Tracker.call(this, name, engine);
}
FormTracker.prototype = {
__proto__: Tracker.prototype,
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
onStart() {
Svc.Obs.add("satchel-storage-changed", this.asyncObserver);
},
onStop() {
--- a/services/sync/modules/engines/history.js
+++ b/services/sync/modules/engines/history.js
@@ -485,17 +485,17 @@ HistoryTracker.prototype = {
PlacesUtils.history.addObserver(this, true);
},
onStop() {
this._log.info("Removing Places observer.");
PlacesUtils.history.removeObserver(this);
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavHistoryObserver,
Ci.nsISupportsWeakReference
]),
async onDeleteAffectsGUID(uri, guid, reason, source, increment) {
if (this.ignoreAll || reason == Ci.nsINavHistoryObserver.REASON_EXPIRED) {
return;
}
--- a/services/sync/modules/engines/tabs.js
+++ b/services/sync/modules/engines/tabs.js
@@ -278,17 +278,17 @@ function TabTracker(name, engine) {
// Make sure "this" pointer is always set correctly for event listeners.
this.onTab = Utils.bind2(this, this.onTab);
this._unregisterListeners = Utils.bind2(this, this._unregisterListeners);
}
TabTracker.prototype = {
__proto__: Tracker.prototype,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
clearChangedIDs() {
this.modified = false;
},
_topics: ["pageshow", "TabOpen", "TabClose", "TabSelect"],
_registerListenersForWindow(window) {
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -411,18 +411,18 @@ Sync11Service.prototype = {
} catch (ex) {
this._log.warn("Could not register engine " + name, ex);
}
}
this.engineManager.setDeclined(declined);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
switch (topic) {
// Ideally this observer should be in the SyncScheduler, but it would require
// some work to know about the sync specific engines. We should move this there once it does.
case "sync:collection_changed":
// We check if we're running TPS here to avoid TPS failing because it
// couldn't get to get the sync lock, due to us currently syncing the
--- a/services/sync/tests/unit/test_history_store.js
+++ b/services/sync/tests/unit/test_history_store.js
@@ -22,17 +22,17 @@ function promiseOnVisitObserved() {
onVisits: function onVisits() {
PlacesUtils.history.removeObserver(this);
res();
},
onDeleteVisits: function onDeleteVisits() {},
onPageExpired: function onPageExpired() {},
onDeleteURI: function onDeleteURI() {},
onClearHistory: function onClearHistory() {},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavHistoryObserver,
Ci.nsINavHistoryObserver_MOZILLA_1_9_1_ADDITIONS,
Ci.nsISupportsWeakReference
])
}, true);
});
}
--- a/services/sync/tps/extensions/tps/bootstrap.js
+++ b/services/sync/tps/extensions/tps/bootstrap.js
@@ -25,17 +25,17 @@ const CATEGORY_ENTRY = "m-tps";
function TPSCmdLine() {}
TPSCmdLine.prototype = {
factory: XPCOMUtils._getFactory(TPSCmdLine),
classDescription: "TPSCmdLine",
classID: Components.ID("{4e5bd3f0-41d3-11df-9879-0800200c9a66}"),
contractID: "@mozilla.org/commandlinehandler/general-startup;1?type=tps",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICommandLineHandler]),
register() {
Cm.registerFactory(this.classID, this.classDescription,
this.contractID, this.factory);
categoryManager.addCategoryEntry(CATEGORY_NAME, CATEGORY_ENTRY,
this.contractID, false, true);
},
--- a/services/sync/tps/extensions/tps/resource/tps.jsm
+++ b/services/sync/tps/extensions/tps/resource/tps.jsm
@@ -158,18 +158,18 @@ var TPS = {
} else {
// always write a stack even if no error passed.
errInfo = Log.stackTrace(new Error());
}
Logger.logError(`[phase ${this._currentPhase}] ${msg} - ${errInfo}`);
this.quit();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
observe: function TPS__observe(subject, topic, data) {
try {
Logger.logInfo("----------event observed: " + topic);
switch (topic) {
case "private-browsing":
Logger.logInfo("private browsing " + data);
--- a/storage/test/unit/test_vacuum.js
+++ b/storage/test/unit/test_vacuum.js
@@ -128,17 +128,17 @@ const TESTS = [
parseInt(Date.now() / 1000));
// Wait for VACUUM begin.
let vacuumObserver = {
gotNotification: false,
observe: function VO_observe(aSubject, aTopic, aData) {
this.gotNotification = true;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
Services.obs.addObserver(vacuumObserver, "test-begin-vacuum");
// Check after a couple seconds that no VACUUM has been run.
do_timeout(2000, function() {
print("Check VACUUM did not run.");
Assert.ok(!vacuumObserver.gotNotification);
Services.obs.removeObserver(vacuumObserver, "test-begin-vacuum");
@@ -172,17 +172,17 @@ const TESTS = [
Services.obs.notifyObservers(null, "test-options", "opt-out");
// Wait for VACUUM begin.
let vacuumObserver = {
gotNotification: false,
observe: function VO_observe(aSubject, aTopic, aData) {
this.gotNotification = true;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
Services.obs.addObserver(vacuumObserver, "test-begin-vacuum");
// Check after a couple seconds that no VACUUM has been run.
do_timeout(2000, function() {
print("Check VACUUM did not run.");
Assert.ok(!vacuumObserver.gotNotification);
Services.obs.removeObserver(vacuumObserver, "test-begin-vacuum");
@@ -264,17 +264,17 @@ const TESTS = [
Services.obs.notifyObservers(null, "test-options", "memory");
// Wait for VACUUM begin.
let vacuumObserver = {
gotNotification: false,
observe: function VO_observe(aSubject, aTopic, aData) {
this.gotNotification = true;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
Services.obs.addObserver(vacuumObserver, "test-begin-vacuum");
// Check after a couple seconds that no VACUUM has been run.
do_timeout(2000, function() {
print("Check VACUUM did not run.");
Assert.ok(!vacuumObserver.gotNotification);
Services.obs.removeObserver(vacuumObserver, "test-begin-vacuum");
--- a/storage/test/unit/vacuumParticipant.js
+++ b/storage/test/unit/vacuumParticipant.js
@@ -94,16 +94,16 @@ vacuumParticipant.prototype =
try {
this._dbConn.asyncClose();
} catch (e) {
// Do nothing.
}
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.mozIStorageVacuumParticipant,
Ci.nsIObserver,
])
};
var gComponentsArray = [vacuumParticipant];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(gComponentsArray);
--- a/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js
+++ b/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js
@@ -155,20 +155,17 @@ RedirectAndAuthStopper.prototype = {
return false;
},
asyncPromptAuth(channel, callback, context, level, authInfo) {
throw new Error(Cr.NS_ERROR_NOT_IMPLEMENTED);
},
getInterface(iid) {
- return this.QueryInterface(iid);
- },
-
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannelEventSink, Ci.nsIAuthPrompt2])
+ return this.QueryInterfChromeUtils.generateQIryInterface: XPCOMUtils.generateQI([Ci.nsIChannelEventSink, Ci.nsIAuthPrompt2])
};
function fetchstatus(host) {
let xhr = new XMLHttpRequest();
let uri = "https://" + host.name + "/";
xhr.open("head", uri, true);
xhr.setRequestHeader("X-Automated-Tool", "https://hg.mozilla.org/mozilla-central/file/tip/security/manager/tools/getHSTSPreloadList.js");
--- a/testing/marionette/cert.js
+++ b/testing/marionette/cert.js
@@ -108,17 +108,17 @@ cert.InsecureSweepingOverride = function
aHostName, aPort, aCert, aOverrideBits, aIsTemporary) {
aIsTemporary.value = false;
aOverrideBits.value =
cert.Error.Untrusted | cert.Error.Mismatch | cert.Error.Time;
return true;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICertOverrideService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICertOverrideService]),
};
let factory = XPCOMUtils.generateSingletonFactory(service);
return {
register() {
// make it possible to register certificate overrides for domains
// that use HSTS or HPKP
Preferences.set(HSTS_PRELOAD_LIST_PREF, false);
--- a/testing/marionette/components/marionette.js
+++ b/testing/marionette/components/marionette.js
@@ -556,17 +556,17 @@ class MarionetteMainProcess {
Preferences.reset(k);
}
this.alteredPrefs.clear();
Services.obs.notifyObservers(this, NOTIFY_RUNNING);
}
}
get QueryInterface() {
- return XPCOMUtils.generateQI([
+ return ChromeUtils.generateQI([
Ci.nsICommandLineHandler,
Ci.nsIMarionette,
Ci.nsIObserver,
]);
}
}
class MarionetteContentProcess {
@@ -575,17 +575,17 @@ class MarionetteContentProcess {
if (reply.length == 0) {
log.warn("No reply from main process");
return false;
}
return reply[0];
}
get QueryInterface() {
- return XPCOMUtils.generateQI([Ci.nsIMarionette]);
+ return ChromeUtils.generateQI([Ci.nsIMarionette]);
}
}
const MarionetteFactory = {
instance_: null,
createInstance(outer, iid) {
if (outer) {
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -264,17 +264,17 @@ Object.defineProperty(GeckoDriver.protot
for (let win of this.windows) {
hs.push(getOuterWindowId(win));
}
return hs;
},
});
-GeckoDriver.prototype.QueryInterface = XPCOMUtils.generateQI([
+GeckoDriver.prototype.QueryInterface = ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
]);
GeckoDriver.prototype.init = function() {
this.mm.addMessageListener("Marionette:WebDriver:GetCapabilities", this);
this.mm.addMessageListener("Marionette:GetLogLevel", this);
this.mm.addMessageListener("Marionette:ListenersAttached", this);
--- a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
+++ b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
@@ -39,17 +39,17 @@ const DEFAULT_PROCESSSELECTOR_CID = EXIS
let gListenerId = 0;
// A process selector that always asks for a new process.
function NewProcessSelector() {
}
NewProcessSelector.prototype = {
classID: OUR_PROCESSSELECTOR_CID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentProcessProvider]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentProcessProvider]),
provideProcess() {
return Ci.nsIContentProcessProvider.NEW_PROCESS;
}
};
let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
let selectorFactory = XPCOMUtils._getFactory(NewProcessSelector);
@@ -377,17 +377,17 @@ var BrowserTestUtils = {
BrowserTestUtils._webProgressListeners.delete(wpl);
resolve();
}
};
},
onSecurityChange() {},
onStatusChange() {},
onLocationChange() {},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsIWebProgressListener2,
Ci.nsISupportsWeakReference,
]),
};
browser.addProgressListener(wpl);
this._webProgressListeners.add(wpl);
dump("Waiting for browser load" + (expectedURI ? (" of " + expectedURI) : "") + "\n");
--- a/testing/mochitest/BrowserTestUtils/content/content-about-page-utils.js
+++ b/testing/mochitest/BrowserTestUtils/content/content-about-page-utils.js
@@ -11,17 +11,17 @@ function AboutPage(aboutHost, chromeURL,
this.chromeURL = chromeURL;
this.aboutHost = aboutHost;
this.classID = Components.ID(generateUUID().number);
this.description = "BrowserTestUtils: " + aboutHost;
this.uriFlags = uriFlags;
}
AboutPage.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
getURIFlags(aURI) { // eslint-disable-line no-unused-vars
return this.uriFlags;
},
newChannel(aURI, aLoadInfo) {
let newURI = Services.io.newURI(this.chromeURL);
let channel = Services.io.newChannelFromURIWithLoadInfo(newURI,
aLoadInfo);
--- a/testing/modules/MockRegistrar.jsm
+++ b/testing/modules/MockRegistrar.jsm
@@ -66,17 +66,17 @@ var MockRegistrar = Object.freeze({
logger.info("Creating original instance failed", ex);
}
return wrappedMock.QueryInterface(iid);
},
lockFactory(lock) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
};
this.registrar.unregisterFactory(originalCID, originalFactory);
this.registrar.registerFactory(originalCID,
"A Mock for " + contractID,
contractID,
factory);
--- a/testing/modules/MockRegistry.jsm
+++ b/testing/modules/MockRegistry.jsm
@@ -28,17 +28,17 @@ class MockRegistry {
* subset of the interface used in tests. In particular, only values
* of type string are supported.
*/
function MockWindowsRegKey() { }
MockWindowsRegKey.prototype = {
values: null,
// --- Overridden nsISupports interface functions ---
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowsRegKey]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowsRegKey]),
// --- Overridden nsIWindowsRegKey interface functions ---
open(root, path, mode) {
let rootKey = registry.getRoot(root);
if (!rootKey.has(path)) {
rootKey.set(path, new Map());
}
this.values = rootKey.get(path);
--- a/testing/modules/tests/xpcshell/test_mockRegistrar.js
+++ b/testing/modules/tests/xpcshell/test_mockRegistrar.js
@@ -7,26 +7,26 @@ ChromeUtils.import("resource://testing-c
function userInfo(username) {
this.username = username;
}
userInfo.prototype = {
fullname: "fullname",
emailAddress: "emailAddress",
domain: "domain",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUserInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUserInfo]),
};
add_test(function test_register() {
let localUserInfo = {
fullname: "fullname",
username: "localusername",
emailAddress: "emailAddress",
domain: "domain",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUserInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUserInfo]),
};
MockRegistrar.register("@mozilla.org/userinfo;1", localUserInfo);
Assert.equal(Cc["@mozilla.org/userinfo;1"].createInstance(Ci.nsIUserInfo).username, "localusername");
run_next_test();
});
add_test(function test_register_with_arguments() {
--- a/testing/specialpowers/content/MockColorPicker.jsm
+++ b/testing/specialpowers/content/MockColorPicker.jsm
@@ -23,17 +23,17 @@ var newFactory = function(window) {
createInstance(aOuter, aIID) {
if (aOuter)
throw Cr.NS_ERROR_NO_AGGREGATION;
return new MockColorPickerInstance(window).QueryInterface(aIID);
},
lockFactory(aLock) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
};
};
var MockColorPicker = {
init(window) {
this.reset();
this.factory = newFactory(window);
if (!registrar.isCIDRegistered(newClassID)) {
@@ -71,17 +71,17 @@ var MockColorPicker = {
}
}
};
function MockColorPickerInstance(window) {
this.window = window;
}
MockColorPickerInstance.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIColorPicker]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIColorPicker]),
init(aParent, aTitle, aInitialColor) {
this.parent = aParent;
this.initialColor = aInitialColor;
},
initialColor: "",
parent: null,
open(aColorPickerShownCallback) {
MockColorPicker.showing = true;
--- a/testing/specialpowers/content/MockFilePicker.jsm
+++ b/testing/specialpowers/content/MockFilePicker.jsm
@@ -24,17 +24,17 @@ var newFactory = function(window) {
createInstance(aOuter, aIID) {
if (aOuter)
throw Cr.NS_ERROR_NO_AGGREGATION;
return new MockFilePickerInstance(window).QueryInterface(aIID);
},
lockFactory(aLock) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
};
};
var MockFilePicker = {
returnOK: Ci.nsIFilePicker.returnOK,
returnCancel: Ci.nsIFilePicker.returnCancel,
returnReplace: Ci.nsIFilePicker.returnReplace,
@@ -153,17 +153,17 @@ var MockFilePicker = {
return null;
}
};
function MockFilePickerInstance(window) {
this.window = window;
}
MockFilePickerInstance.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFilePicker]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFilePicker]),
init(aParent, aTitle, aMode) {
MockFilePicker.mode = aMode;
this.filterIndex = MockFilePicker.filterIndex;
this.parent = aParent;
},
appendFilter(aTitle, aFilter) {
if (typeof MockFilePicker.appendFilterCallback == "function")
MockFilePicker.appendFilterCallback(this, aTitle, aFilter);
@@ -208,34 +208,34 @@ MockFilePickerInstance.prototype = {
return Services.io.newFileURI(MockFilePicker.returnData[0].nsIFile);
}
return null;
},
get files() {
return {
index: 0,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISimpleEnumerator]),
hasMoreElements() {
return this.index < MockFilePicker.returnData.length;
},
getNext() {
if (!MockFilePicker.returnData[this.index].nsIFile) {
return null;
}
return MockFilePicker.returnData[this.index++].nsIFile;
}
};
},
get domFileOrDirectoryEnumerator() {
this.parent.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
return {
index: 0,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISimpleEnumerator]),
hasMoreElements() {
return this.index < MockFilePicker.returnData.length;
},
getNext() {
// window.File does not implement nsIFile
if (MockFilePicker.returnData[this.index].domFile) {
return MockFilePicker.returnData[this.index++].domFile;
}
--- a/testing/specialpowers/content/MockPermissionPrompt.jsm
+++ b/testing/specialpowers/content/MockPermissionPrompt.jsm
@@ -19,17 +19,17 @@ var newFactory = {
createInstance(aOuter, aIID) {
if (aOuter)
throw Cr.NS_ERROR_NO_AGGREGATION;
return new MockPermissionPromptInstance().QueryInterface(aIID);
},
lockFactory(aLock) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
};
var MockPermissionPrompt = {
init() {
this.reset();
if (!registrar.isCIDRegistered(newClassID)) {
try {
oldClassID = registrar.contractIDToCID(CONTRACT_ID);
@@ -56,17 +56,17 @@ var MockPermissionPrompt = {
registrar.unregisterFactory(newClassID, newFactory);
registrar.registerFactory(oldClassID, "", CONTRACT_ID, oldFactory);
}
},
};
function MockPermissionPromptInstance() { }
MockPermissionPromptInstance.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionPrompt]),
promptResult: Ci.nsIPermissionManager.UNKNOWN_ACTION,
prompt(request) {
let perms = request.types.QueryInterface(Ci.nsIArray);
for (let idx = 0; idx < perms.length; idx++) {
let perm = perms.queryElementAt(idx, Ci.nsIContentPermissionType);
--- a/testing/specialpowers/content/SpecialPowersObserver.jsm
+++ b/testing/specialpowers/content/SpecialPowersObserver.jsm
@@ -32,17 +32,17 @@ function SpecialPowersObserver() {
}
SpecialPowersObserver.prototype = new SpecialPowersObserverAPI();
SpecialPowersObserver.prototype.classDescription = "Special powers Observer for use in testing.";
SpecialPowersObserver.prototype.classID = Components.ID("{59a52458-13e0-4d93-9d85-a637344f29a1}");
SpecialPowersObserver.prototype.contractID = "@mozilla.org/special-powers-observer;1";
-SpecialPowersObserver.prototype.QueryInterface = XPCOMUtils.generateQI([Ci.nsIObserver]);
+SpecialPowersObserver.prototype.QueryInterface = ChromeUtils.generateQI([Ci.nsIObserver]);
SpecialPowersObserver.prototype.observe = function(aSubject, aTopic, aData) {
switch (aTopic) {
case "chrome-document-global-created":
this._loadFrameScript();
break;
case "http-on-modify-request":
@@ -291,10 +291,10 @@ SpecialPowersObserver.prototype.receiveM
};
var SpecialPowersObserverFactory = Object.freeze({
createInstance(outer, id) {
if (outer) { throw Cr.NS_ERROR_NO_AGGREGATION; }
return new SpecialPowersObserver();
},
loadFactory(lock) {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory])
});
--- a/testing/specialpowers/content/specialpowersAPI.js
+++ b/testing/specialpowers/content/specialpowersAPI.js
@@ -376,18 +376,18 @@ SPConsoleListener.prototype = {
});
if (!m.isScriptError && !m.isConsoleEvent && m.message === "SENTINEL") {
Services.obs.removeObserver(this, "console-api-log-event");
Services.console.unregisterListener(this);
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIConsoleListener,
- Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIConsoleListener,
+ Ci.nsIObserver])
};
function wrapCallback(cb) {
return function SpecialPowersCallbackWrapper() {
var args = Array.prototype.map.call(arguments, wrapIfUnwrapped);
return cb.apply(this, args);
};
}
--- a/testing/talos/talos/pageloader/bootstrap.js
+++ b/testing/talos/talos/pageloader/bootstrap.js
@@ -56,17 +56,17 @@ const CATEGORY_ENTRY = "m-tp";
function PageLoaderCmdLine() {}
PageLoaderCmdLine.prototype =
{
factory: XPCOMUtils._getFactory(PageLoaderCmdLine),
classDescription: "Loads pages. Tests them.",
classID: Components.ID("{8AF052F5-8EFE-4359-8266-E16498A82E8B}"),
contractID: "@mozilla.org/commandlinehandler/general-startup;1?type=tp",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICommandLineHandler]),
register() {
Cm.registerFactory(this.classID, this.classDescription,
this.contractID, this.factory);
categoryManager.addCategoryEntry(CATEGORY_NAME, CATEGORY_ENTRY,
this.contractID, false, true);
},
--- a/testing/talos/talos/startup_test/sessionrestore/addon/bootstrap.js
+++ b/testing/talos/talos/startup_test/sessionrestore/addon/bootstrap.js
@@ -18,17 +18,17 @@ ChromeUtils.defineModuleGetter(this, "St
// Observer Service topics.
const WINDOW_READY_TOPIC = "browser-delayed-startup-finished";
// Process Message Manager topics.
const MSG_REQUEST = "session-restore-test?duration";
const MSG_PROVIDE = "session-restore-test:duration";
const sessionRestoreTest = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
// ////////////////////////////////////////////////////////////////////////////
// // nsIObserver
observe: function DS_observe(aSubject, aTopic, aData) {
switch (aTopic) {
case StartupPerformance.RESTORED_TOPIC:
this.onReady(true);
--- a/testing/talos/talos/talos-powers/bootstrap.js
+++ b/testing/talos/talos/talos-powers/bootstrap.js
@@ -20,17 +20,17 @@ function TalosPowersService() {
this.init();
}
TalosPowersService.prototype = {
factory: XPCOMUtils._getFactory(TalosPowersService),
classDescription: "Talos Powers",
classID: Components.ID("{f5d53443-d58d-4a2f-8df0-98525d4f91ad}"),
contractID: "@mozilla.org/talos/talos-powers-service;1",
- QueryInterface: XPCOMUtils.generateQI([]),
+ QueryInterface: ChromeUtils.generateQI([]),
register() {
Cm.registerFactory(this.classID, this.classDescription,
this.contractID, this.factory);
void Cc[this.contractID].getService();
},
--- a/testing/talos/talos/tests/tabswitch/api.js
+++ b/testing/talos/talos/tests/tabswitch/api.js
@@ -45,18 +45,18 @@ function loadTabs(gBrowser, urls) {
gBrowser.loadTabs(urls, {
inBackground: true,
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
});
let waitingToLoad = new Set(urls);
let listener = {
- QueryInterface: XPCOMUtils.generateQI(["nsIWebProgressListener",
- "nsISupportsWeakReference"]),
+ QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
+ "nsISupportsWeakReference"]),
onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
let loadedState = Ci.nsIWebProgressListener.STATE_STOP |
Ci.nsIWebProgressListener.STATE_IS_NETWORK;
if ((aStateFlags & loadedState) == loadedState &&
!aWebProgress.isLoadingDocument &&
aWebProgress.isTopLevel &&
Components.isSuccessCode(aStatus)) {
--- a/testing/talos/talos/tests/tabswitch/content/tabswitch-content-process.js
+++ b/testing/talos/talos/tests/tabswitch/content/tabswitch-content-process.js
@@ -14,17 +14,17 @@ XPCOMUtils.defineLazyGetter(
const TPSProcessScript = {
init() {
let extensionChild = processScript.getExtensionChild(WEBEXTENSION_ID);
let aboutPageURI = extensionChild.baseURI.resolve(ABOUT_PATH_PATH);
class TabSwitchAboutModule {
constructor() {
- this.QueryInterface = XPCOMUtils.generateQI([Ci.nsIAboutModule]);
+ this.QueryInterface = ChromeUtils.generateQI([Ci.nsIAboutModule]);
}
newChannel(aURI, aLoadInfo) {
let uri = Services.io.newURI(aboutPageURI);
let chan = Services.io.newChannelFromURIWithLoadInfo(uri, aLoadInfo);
chan.originalURI = aURI;
return chan;
}
getURIFlags(aURI) {
--- a/toolkit/components/asyncshutdown/nsAsyncShutdown.js
+++ b/toolkit/components/asyncshutdown/nsAsyncShutdown.js
@@ -172,17 +172,17 @@ nsAsyncShutdownClient.prototype = {
if (!moduleBlocker) {
return false;
}
this._deletePromisified(xpcomBlocker);
return this._moduleClient.removeBlocker(moduleBlocker);
},
/* ........ QueryInterface .............. */
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAsyncShutdownBarrier]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAsyncShutdownBarrier]),
classID: Components.ID("{314e9e96-cc37-4d5c-843b-54709ce11426}"),
};
/**
* Construct an instance of nsIAsyncShutdownBarrier from an instance
* of AsyncShutdown.Barrier.
*
* @param {object} moduleBarrier an instance if
@@ -204,17 +204,17 @@ nsAsyncShutdownBarrier.prototype = {
wait(onReady) {
this._moduleBarrier.wait().then(() => {
onReady.done();
});
// By specification, _moduleBarrier.wait() cannot reject.
},
/* ........ QueryInterface .............. */
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAsyncShutdownBarrier]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAsyncShutdownBarrier]),
classID: Components.ID("{29a0e8b5-9111-4c09-a0eb-76cd02bf20fa}"),
};
function nsAsyncShutdownService() {
// Cache for the getters
for (let _k of
[// Parent process
@@ -251,17 +251,17 @@ function nsAsyncShutdownService() {
};
}
nsAsyncShutdownService.prototype = {
makeBarrier(name) {
return new nsAsyncShutdownBarrier(new AsyncShutdown.Barrier(name));
},
/* ........ QueryInterface .............. */
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAsyncShutdownService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAsyncShutdownService]),
classID: Components.ID("{35c496de-a115-475d-93b5-ffa3f3ae6fe3}"),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
nsAsyncShutdownService,
nsAsyncShutdownBarrier,
nsAsyncShutdownClient,
--- a/toolkit/components/autocomplete/tests/unit/head_autocomplete.js
+++ b/toolkit/components/autocomplete/tests/unit/head_autocomplete.js
@@ -54,17 +54,17 @@ AutoCompleteInputBase.prototype = {
get popup() {
if (!this._popup) {
this._popup = new AutocompletePopupBase(this);
}
return this._popup;
},
// nsISupports implementation
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteInput])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteInput])
};
/**
* nsIAutoCompleteResult implementation
*/
function AutoCompleteResultBase(aValues) {
this._values = aValues;
}
@@ -107,17 +107,17 @@ AutoCompleteResultBase.prototype = {
getFinalCompleteValueAt(aIndex) {
return this._finalCompleteValues[aIndex] || this._values[aIndex];
},
removeValueAt(aRowIndex, aRemoveFromDb) {},
// nsISupports implementation
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteResult])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteResult])
};
/**
* nsIAutoCompleteSearch implementation that always returns
* the same result set.
*/
function AutoCompleteSearchBase(aName, aResult) {
this.name = aName;
@@ -139,18 +139,18 @@ AutoCompleteSearchBase.prototype = {
result.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
aListener.onSearchResult(this, result);
},
stopSearch() {},
// nsISupports implementation
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory,
- Ci.nsIAutoCompleteSearch]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory,
+ Ci.nsIAutoCompleteSearch]),
// nsIFactory implementation
createInstance(outer, iid) {
return this.QueryInterface(iid);
}
};
function AutocompletePopupBase(input) {
@@ -164,17 +164,17 @@ AutocompletePopupBase.prototype = {
if (numRows > 0) {
let delta = reverse ? -1 : 1;
this.selectedIndex = (this.selectedIndex + delta) % numRows;
if (this.selectedIndex < 0) {
this.selectedIndex = numRows - 1;
}
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompletePopup]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompletePopup]),
};
/**
* Helper to register an AutoCompleteSearch with the given name.
* Allows the AutoCompleteController to find the search.
*/
function registerAutoCompleteSearch(aSearch) {
var name = "@mozilla.org/autocomplete/search;1?name=" + aSearch.name;
--- a/toolkit/components/autocomplete/tests/unit/test_immediate_search.js
+++ b/toolkit/components/autocomplete/tests/unit/test_immediate_search.js
@@ -6,19 +6,19 @@
function AutoCompleteImmediateSearch(aName, aResult) {
this.name = aName;
this._result = aResult;
}
AutoCompleteImmediateSearch.prototype = Object.create(AutoCompleteSearchBase.prototype);
AutoCompleteImmediateSearch.prototype.searchType =
Ci.nsIAutoCompleteSearchDescriptor.SEARCH_TYPE_IMMEDIATE;
AutoCompleteImmediateSearch.prototype.QueryInterface =
- XPCOMUtils.generateQI([Ci.nsIFactory,
- Ci.nsIAutoCompleteSearch,
- Ci.nsIAutoCompleteSearchDescriptor]);
+ ChromeUtils.generateQI([Ci.nsIFactory,
+ Ci.nsIAutoCompleteSearch,
+ Ci.nsIAutoCompleteSearchDescriptor]);
function AutoCompleteDelayedSearch(aName, aResult) {
this.name = aName;
this._result = aResult;
}
AutoCompleteDelayedSearch.prototype = Object.create(AutoCompleteSearchBase.prototype);
function AutoCompleteResult(aValues, aDefaultIndex) {
--- a/toolkit/components/autocomplete/tests/unit/test_stopSearch.js
+++ b/toolkit/components/autocomplete/tests/unit/test_stopSearch.js
@@ -36,19 +36,19 @@ AutoCompleteInput.prototype = {
onSearchComplete() {},
onTextReverted() {},
onTextEntered() {},
popup: {
selectBy() {},
invalidate() {},
set selectedIndex(val) { return val; }, // ignore
get selectedIndex() { return -1; },
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompletePopup])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompletePopup])
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteInput])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteInput])
};
/**
* nsIAutoCompleteSearch implementation.
*/
function AutoCompleteSearch(aName) {
this.name = aName;
@@ -59,17 +59,17 @@ AutoCompleteSearch.prototype = {
startSearch(aSearchString, aSearchParam, aPreviousResult, aListener) {
print("Check stop search has been called");
Assert.ok(this.stopSearchInvoked);
this.stopSearchInvoked = false;
},
stopSearch() {
this.stopSearchInvoked = true;
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIFactory,
Ci.nsIAutoCompleteSearch
]),
createInstance(outer, iid) {
return this.QueryInterface(iid);
}
};
--- a/toolkit/components/backgroundhangmonitor/BHRTelemetryService.js
+++ b/toolkit/components/backgroundhangmonitor/BHRTelemetryService.js
@@ -18,17 +18,17 @@ function BHRTelemetryService() {
Services.obs.addObserver(this, "bhr-thread-hang");
Services.obs.addObserver(this, "idle-daily");
this.resetPayload();
}
BHRTelemetryService.prototype = Object.freeze({
classID: Components.ID("{117c8cdf-69e6-4f31-a439-b8a654c67127}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
TRANSMIT_HANG_COUNT: 50,
resetPayload() {
this.startTime = +new Date();
this.payload = {
modules: [],
hangs: [],
--- a/toolkit/components/captivedetect/captivedetect.js
+++ b/toolkit/components/captivedetect/captivedetect.js
@@ -110,18 +110,18 @@ function LoginObserver(captivePortalDete
pageCheckingDone();
}
};
urlFetcher.onredirectorerror = pageCheckingDone;
};
// Public interface of LoginObserver
let observer = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIHttpActivityObserver,
- Ci.nsITimerCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIHttpActivityObserver,
+ Ci.nsITimerCallback]),
attach: function attach() {
if (state === LOGIN_OBSERVER_STATE_DETACHED) {
activityDistributor.addObserver(this);
state = LOGIN_OBSERVER_STATE_IDLE;
timer.initWithCallback(this,
captivePortalDetector._pollingTime,
timer.TYPE_ONE_SHOT);
@@ -223,17 +223,17 @@ function CaptivePortalDetector() {
}
CaptivePortalDetector.prototype = {
classID: kCAPTIVEPORTALDETECTOR_CID,
classInfo: XPCOMUtils.generateCI({classID: kCAPTIVEPORTALDETECTOR_CID,
contractID: kCAPTIVEPORTALDETECTOR_CONTRACTID,
classDescription: "Captive Portal Detector",
interfaces: [Ci.nsICaptivePortalDetector]}),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalDetector]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalDetector]),
// nsICaptivePortalDetector
checkCaptivePortal: function checkCaptivePortal(aInterfaceName, aCallback) {
if (!this._canonicalSiteURL) {
throw Components.Exception("No canonical URL set up.");
}
// Prevent multiple requests on a single network interface
--- a/toolkit/components/captivedetect/test/unit/test_abort.js
+++ b/toolkit/components/captivedetect/test/unit/test_abort.js
@@ -28,17 +28,17 @@ function fakeUIResponse() {
}
}, "captive-portal-login");
}
function test_abort() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
do_throw("should not execute |complete| callback");
},
};
--- a/toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js
+++ b/toolkit/components/captivedetect/test/unit/test_abort_during_user_login.js
@@ -42,17 +42,17 @@ function fakeUIResponse() {
}
}, "captive-portal-login-abort");
}
function test_abort() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
do_throw("should not execute |complete| callback");
},
};
--- a/toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js
+++ b/toolkit/components/captivedetect/test/unit/test_abort_ongoing_request.js
@@ -33,28 +33,28 @@ function fakeUIResponse() {
}
}, "captive-portal-login");
}
function test_multiple_requests_abort() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
do_throw("should not execute |complete| callback for " + kInterfaceName);
},
};
let otherCallback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 2);
gCaptivePortalDetector.finishPreparation(kOtherInterfaceName);
},
complete: function complete(success) {
Assert.equal(++step, 4);
Assert.ok(success);
gServer.stop(do_test_finished);
--- a/toolkit/components/captivedetect/test/unit/test_abort_pending_request.js
+++ b/toolkit/components/captivedetect/test/unit/test_abort_pending_request.js
@@ -33,30 +33,30 @@ function fakeUIResponse() {
}
}, "captive-portal-login");
}
function test_abort() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
Assert.equal(++step, 3);
Assert.ok(success);
gServer.stop(do_test_finished);
},
};
let otherCallback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
do_throw("should not execute |prepare| callback for " + kOtherInterfaceName);
},
complete: function complete(success) {
do_throw("should not execute |complete| callback for " + kInterfaceName);
}
};
--- a/toolkit/components/captivedetect/test/unit/test_captive_portal_found.js
+++ b/toolkit/components/captivedetect/test/unit/test_captive_portal_found.js
@@ -39,17 +39,17 @@ function fakeUIResponse() {
}
}, "captive-portal-login-success");
}
function test_portal_found() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
// Since this is a synchronous callback, it must happen before
// 'captive-portal-login-success' is received.
// (Check captivedetect.js::executeCallback
--- a/toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js
+++ b/toolkit/components/captivedetect/test/unit/test_captive_portal_found_303.js
@@ -45,17 +45,17 @@ function fakeUIResponse() {
}
}, "captive-portal-login-success");
}
function test_portal_found() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
Assert.equal(++step, 3);
Assert.ok(success);
},
--- a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js
+++ b/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found.js
@@ -26,17 +26,17 @@ function fakeUIResponse() {
}
}, "captive-portal-login");
}
function test_portal_not_found() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
Assert.equal(++step, 2);
Assert.ok(success);
Assert.equal(attempt, 1);
--- a/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js
+++ b/toolkit/components/captivedetect/test/unit/test_captive_portal_not_found_404.js
@@ -23,17 +23,17 @@ function fakeUIResponse() {
}
}, "captive-portal-login");
}
function test_portal_not_found() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
Assert.equal(++step, 2);
Assert.ok(!success);
Assert.equal(attempt, 6);
--- a/toolkit/components/captivedetect/test/unit/test_multiple_requests.js
+++ b/toolkit/components/captivedetect/test/unit/test_multiple_requests.js
@@ -44,29 +44,29 @@ function fakeUIResponse() {
}
}, "captive-portal-login-success");
}
function test_multiple_requests() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
Assert.equal(++step, 3);
Assert.ok(success);
},
};
let otherCallback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 5);
gCaptivePortalDetector.finishPreparation(kOtherInterfaceName);
},
complete: function complete(success) {
Assert.equal(++step, 6);
Assert.ok(success);
gServer.stop(do_test_finished);
--- a/toolkit/components/captivedetect/test/unit/test_user_cancel.js
+++ b/toolkit/components/captivedetect/test/unit/test_user_cancel.js
@@ -28,17 +28,17 @@ function fakeUIResponse() {
}
}, "captive-portal-login");
}
function test_cancel() {
do_test_pending();
let callback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalCallback]),
prepare: function prepare() {
Assert.equal(++step, 1);
gCaptivePortalDetector.finishPreparation(kInterfaceName);
},
complete: function complete(success) {
Assert.equal(++step, 3);
Assert.ok(!success);
gServer.stop(do_test_finished);
--- a/toolkit/components/contentprefs/ContentPrefService2.js
+++ b/toolkit/components/contentprefs/ContentPrefService2.js
@@ -1212,17 +1212,17 @@ function invalidArg(msg) {
function HostnameGrouper() {}
HostnameGrouper.prototype = {
// XPCOM Plumbing
classID: Components.ID("{8df290ae-dcaa-4c11-98a5-2429a4dc97bb}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentURIGrouper]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentURIGrouper]),
// nsIContentURIGrouper
group: function HostnameGrouper_group(aURI) {
var group;
try {
// Accessing the host property of the URI will throw an exception
--- a/toolkit/components/contentprefs/ContentPrefServiceChild.jsm
+++ b/toolkit/components/contentprefs/ContentPrefServiceChild.jsm
@@ -40,17 +40,17 @@ CallbackCaller.prototype = {
},
handleCompletion(reason) {
cbHandleCompletion(this._callback, reason);
},
};
var ContentPrefServiceChild = {
- QueryInterface: XPCOMUtils.generateQI([ Ci.nsIContentPrefService2 ]),
+ QueryInterface: ChromeUtils.generateQI([ Ci.nsIContentPrefService2 ]),
// Map from pref name -> set of observers
_observers: new Map(),
_getRandomId() {
return Cc["@mozilla.org/uuid-generator;1"]
.getService(Ci.nsIUUIDGenerator).generateUUID().toString();
},
--- a/toolkit/components/contentprefs/ContentPrefUtils.jsm
+++ b/toolkit/components/contentprefs/ContentPrefUtils.jsm
@@ -19,17 +19,17 @@ ChromeUtils.import("resource://gre/modul
function ContentPref(domain, name, value) {
this.domain = domain;
this.name = name;
this.value = value;
}
ContentPref.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPref]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPref]),
};
function cbHandleResult(callback, pref) {
safeCallback(callback, "handleResult", [pref]);
}
function cbHandleCompletion(callback, reason) {
safeCallback(callback, "handleCompletion", [reason]);
--- a/toolkit/components/contextualidentity/ContextualIdentityService.jsm
+++ b/toolkit/components/contextualidentity/ContextualIdentityService.jsm
@@ -40,17 +40,17 @@ function _TabRemovalObserver(resolver, t
this._tabParentIds = tabParentIds;
Services.obs.addObserver(this, "ipc:browser-destroyed");
}
_TabRemovalObserver.prototype = {
_resolver: null,
_tabParentIds: null,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
observe(subject, topic, data) {
let tabParent = subject.QueryInterface(Ci.nsITabParent);
if (this._tabParentIds.has(tabParent.tabId)) {
this._tabParentIds.delete(tabParent.tabId);
if (this._tabParentIds.size == 0) {
Services.obs.removeObserver(this, "ipc:browser-destroyed");
this._resolver();
--- a/toolkit/components/crashes/CrashService.js
+++ b/toolkit/components/crashes/CrashService.js
@@ -152,17 +152,17 @@ function processExtraFile(extraPath) {
* It is a service because some background activity will eventually occur.
*/
this.CrashService = function() {
Services.obs.addObserver(this, "quit-application");
};
CrashService.prototype = Object.freeze({
classID: Components.ID("{92668367-1b17-4190-86b2-1061b2179744}"),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsICrashService,
Ci.nsIObserver,
]),
async addCrash(processType, crashType, id) {
switch (processType) {
case Ci.nsICrashService.PROCESS_TYPE_MAIN:
processType = Services.crashmanager.PROCESS_TYPE_MAIN;
--- a/toolkit/components/crashmonitor/nsCrashMonitor.js
+++ b/toolkit/components/crashmonitor/nsCrashMonitor.js
@@ -11,17 +11,17 @@ var MonitorAPI = Scope.CrashMonitor;
function CrashMonitor() {}
CrashMonitor.prototype = {
classID: Components.ID("{d9d75e86-8f17-4c57-993e-f738f0d86d42}"),
contractID: "@mozilla.org/toolkit/crashmonitor;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
observe(aSubject, aTopic, aData) {
switch (aTopic) {
case "profile-after-change":
MonitorAPI.init();
}
},
};
--- a/toolkit/components/downloads/DownloadCore.jsm
+++ b/toolkit/components/downloads/DownloadCore.jsm
@@ -1967,18 +1967,18 @@ this.DownloadCopySaver.prototype = {
} catch (ex) {
if (!(ex instanceof OS.File.Error) || !ex.becauseNoSuchFile) {
throw ex;
}
}
}
channel.notificationCallbacks = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIInterfaceRequestor]),
- getInterface: XPCOMUtils.generateQI([Ci.nsIProgressEventSink]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor]),
+ getInterface: ChromeUtils.generateQI([Ci.nsIProgressEventSink]),
onProgress: function DCSE_onProgress(aRequest, aContext, aProgress,
aProgressMax) {
let currentBytes = resumeFromBytes + aProgress;
let totalBytes = aProgressMax == -1 ? -1 : (resumeFromBytes +
aProgressMax);
aSetProgressBytesFn(currentBytes, totalBytes, aProgress > 0 &&
partFilePath && keepPartialData);
},
--- a/toolkit/components/downloads/DownloadIntegration.jsm
+++ b/toolkit/components/downloads/DownloadIntegration.jsm
@@ -981,17 +981,17 @@ var DownloadObserver = {
case "xpcom-will-shutdown":
for (let topic of kObserverTopics) {
Services.obs.removeObserver(this, topic);
}
break;
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
/**
* Registers a Places observer so that operations on download history are
* reflected on the provided list of downloads.
*
* You do not need to keep a reference to this object in order to keep it alive,
* because the history service already keeps a strong reference to it.
@@ -1005,17 +1005,17 @@ var DownloadHistoryObserver = function(a
};
this.DownloadHistoryObserver.prototype = {
/**
* DownloadList object linked to this observer.
*/
_list: null,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver]),
// nsINavHistoryObserver
onDeleteURI: function DL_onDeleteURI(aURI, aGUID) {
this._list.removeFinished(download => aURI.equals(NetUtil.newURI(
download.source.url)));
},
// nsINavHistoryObserver
--- a/toolkit/components/downloads/DownloadLegacy.js
+++ b/toolkit/components/downloads/DownloadLegacy.js
@@ -50,19 +50,19 @@ ChromeUtils.defineModuleGetter(this, "Do
function DownloadLegacyTransfer() {
this._promiseDownload = new Promise(r => this._resolveDownload = r);
}
DownloadLegacyTransfer.prototype = {
classID: Components.ID("{1b4c85df-cbdd-4bb6-b04e-613caece083c}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsIWebProgressListener2,
- Ci.nsITransfer]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsIWebProgressListener2,
+ Ci.nsITransfer]),
// nsIWebProgressListener
onStateChange: function DLT_onStateChange(aWebProgress, aRequest, aStateFlags,
aStatus) {
if (!Components.isSuccessCode(aStatus)) {
this._componentFailed = true;
}
--- a/toolkit/components/downloads/test/unit/head.js
+++ b/toolkit/components/downloads/test/unit/head.js
@@ -145,17 +145,17 @@ function promiseTimeout(aTime) {
* @rejects Never.
*/
function promiseWaitForVisit(aUrl) {
return new Promise(resolve => {
let uri = NetUtil.newURI(aUrl);
PlacesUtils.history.addObserver({
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver]),
onBeginUpdateBatch() {},
onEndUpdateBatch() {},
onVisits(aVisits) {
Assert.equal(aVisits.length, 1);
let {
uri: visitUri,
time,
transitionType,
@@ -752,17 +752,17 @@ add_task(function test_common_initialize
_getDirectory(name) {
return super._getDirectory(this._allowDirectories ? name : "TmpD");
},
}));
// Make sure that downloads started using nsIExternalHelperAppService are
// saved to disk without asking for a destination interactively.
let mock = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIHelperAppLauncherDialog]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIHelperAppLauncherDialog]),
promptForSaveToFileAsync(aLauncher,
aWindowContext,
aDefaultFileName,
aSuggestedFileExtension,
aForcePrompt) {
// The dialog should create the empty placeholder file.
let file = getTempFile(TEST_TARGET_FILE_NAME);
file.create(Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
--- a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
+++ b/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
@@ -78,17 +78,17 @@ function frameScript() {
Services.obs.notifyObservers(null, "memory-pressure", "heap-minimize");
}, true, true);
}
let kungFuDeathGrip = new Set();
function promiseBrowserLoaded(browser, url, redirectUrl) {
return new Promise(resolve => {
const listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIWebProgressListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIWebProgressListener]),
onStateChange(webProgress, request, stateFlags, statusCode) {
let requestUrl = request.originalURI ? request.originalURI.spec : webProgress.DOMWindow.location.href;
if (webProgress.isTopLevel &&
(requestUrl === url || requestUrl === redirectUrl) &&
(stateFlags & Ci.nsIWebProgressListener.STATE_STOP)) {
resolve();
kungFuDeathGrip.delete(listener);
@@ -666,17 +666,17 @@ var ExtensionTestUtils = {
getFile(prop, persistent) {
persistent.value = false;
if (prop == "TmpD") {
return tmpD.clone();
}
return null;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDirectoryServiceProvider]),
};
Services.dirsvc.registerProvider(dirProvider);
scope.registerCleanupFunction(() => {
try {
tmpD.remove(true);
} catch (e) {
--- a/toolkit/components/extensions/extension-process-script.js
+++ b/toolkit/components/extensions/extension-process-script.js
@@ -477,17 +477,17 @@ function ExtensionProcessScript() {
}
return ExtensionProcessScript.singleton;
}
ExtensionProcessScript.singleton = null;
ExtensionProcessScript.prototype = {
classID: Components.ID("{21f9819e-4cdf-49f9-85a0-850af91a5058}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.mozIExtensionProcessScript]),
+ QueryInterface: ChromeUtils.generateQI([Ci.mozIExtensionProcessScript]),
get wrappedJSObject() { return this; },
getFrameData(global, force) {
let extGlobal = DocumentManager.globals.get(global);
return extGlobal && extGlobal.getFrameData(force);
},
--- a/toolkit/components/extensions/parent/ext-identity.js
+++ b/toolkit/components/extensions/parent/ext-identity.js
@@ -20,19 +20,19 @@ const checkRedirected = (url, redirectUR
reject(0);
};
// An unexpected error happened, log for extension authors.
xhr.onerror = () => {
reject(xhr.status);
};
// Catch redirect to our redirect_uri before a new request is made.
xhr.channel.notificationCallbacks = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIInterfaceRequestor, Ci.nsIChannelEventSync]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor, Ci.nsIChannelEventSync]),
- getInterface: XPCOMUtils.generateQI([Ci.nsIChannelEventSink]),
+ getInterface: ChromeUtils.generateQI([Ci.nsIChannelEventSink]),
asyncOnChannelRedirect(oldChannel, newChannel, flags, callback) {
let responseURL = newChannel.URI.spec;
if (responseURL.startsWith(redirectURI)) {
resolve(responseURL);
// Cancel the redirect.
callback.onRedirectVerifyCallback(Cr.NS_BINDING_ABORTED);
return;
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_auth.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_auth.html
@@ -72,21 +72,21 @@ add_task(async function test_webRequest_
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
let observer = channel => {
if (!(channel instanceof Ci.nsIHttpChannel && channel.URI.host === "mochi.test")) {
return;
}
Services.obs.removeObserver(observer, "http-on-modify-request");
channel.notificationCallbacks = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIInterfaceRequestor,
- Ci.nsIAuthPromptProvider,
- Ci.nsIAuthPrompt2]),
- getInterface: XPCOMUtils.generateQI([Ci.nsIAuthPromptProvider,
- Ci.nsIAuthPrompt2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor,
+ Ci.nsIAuthPromptProvider,
+ Ci.nsIAuthPrompt2]),
+ getInterface: ChromeUtils.generateQI([Ci.nsIAuthPromptProvider,
+ Ci.nsIAuthPrompt2]),
promptAuth(channel, level, authInfo) {
throw Cr.NS_ERROR_NO_INTERFACE;
},
getAuthPrompt(reason, iid) {
return this;
},
asyncPromptAuth(channel, callback, context, level, authInfo) {
// We just cancel here, we're only ensuring that non-webrequest
@@ -132,19 +132,19 @@ add_task(async function test_webRequest_
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
let observer = channel => {
if (!(channel instanceof Ci.nsIHttpChannel && channel.URI.host === "mochi.test")) {
return;
}
Services.obs.removeObserver(observer, "http-on-modify-request");
channel.notificationCallbacks = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIInterfaceRequestor,
- Ci.nsIAuthPrompt2]),
- getInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor,
+ Ci.nsIAuthPrompt2]),
+ getInterface: ChromeUtils.generateQI([Ci.nsIAuthPrompt2]),
promptAuth(request, level, authInfo) {
throw Cr.NS_ERROR_NO_INTERFACE;
},
asyncPromptAuth(request, callback, context, level, authInfo) {
// We just cancel here, we're only ensuring that non-webrequest
// notificationcallbacks get called if webrequest doesn't handle it.
Promise.resolve().then(() => {
request.cancel(Cr.NS_BINDING_ABORTED);
--- a/toolkit/components/extensions/test/xpcshell/test_ext_idle.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_idle.js
@@ -20,17 +20,17 @@ let idleService = {
this._activity.observerFires = [];
},
_fireObservers: function(state) {
for (let observer of this._observers.values()) {
observer.observe(observer, state, null);
this._activity.observerFires.push(state);
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIIdleService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIIdleService]),
idleTime: 19999,
addIdleObserver: function(observer, time) {
this._observers.add(observer);
this._activity.addCalls.push(time);
},
removeIdleObserver: function(observer, time) {
this._observers.delete(observer);
this._activity.removeCalls.push(time);
--- a/toolkit/components/extensions/test/xpcshell/test_ext_management_uninstall_self.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_management_uninstall_self.js
@@ -28,17 +28,17 @@ const waitForUninstalled = () => new Pro
resolve();
},
};
AddonManager.addAddonListener(listener);
});
let promptService = {
_response: null,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
confirmEx: function(...args) {
this._confirmExArgs = args;
return this._response;
},
};
add_task(async function setup() {
let fakePromptService = MockRegistrar.register("@mozilla.org/embedcomp/prompt-service;1", promptService);
--- a/toolkit/components/extensions/test/xpcshell/test_ext_redirects.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_redirects.js
@@ -20,18 +20,18 @@ server.registerPathHandler("/redirect",
server.registerPathHandler("/dummy", (request, response) => {
response.setStatusLine(request.httpVersion, 200, "OK");
response.write("ok");
});
function onStopListener(channel) {
return new Promise(resolve => {
let orig = channel.QueryInterface(Ci.nsITraceableChannel).setNewListener({
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRequestObserver,
- Ci.nsIStreamListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRequestObserver,
+ Ci.nsIStreamListener]),
getFinalURI(request) {
let {loadInfo} = request;
return (loadInfo && loadInfo.resultPrincipalURI) || request.originalURI;
},
onDataAvailable(...args) {
orig.onDataAvailable(...args);
},
onStartRequest(request, context) {
--- a/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_suspend.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_suspend.js
@@ -191,17 +191,17 @@ add_task(async function test_set_respons
let channel = NetUtil.newChannel({
uri: "http://example.com/?modify_headers",
loadingPrincipal: ssm.createCodebasePrincipalFromOrigin("http://example.com"),
contentPolicyType: Ci.nsIContentPolicy.TYPE_XMLHTTPREQUEST,
securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
});
channel.asyncOpen2({
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamListener]),
onStartRequest(request, context) {
request.QueryInterface(Ci.nsIHttpChannel);
try {
resolveHeaderPromise(request.getResponseHeader("foo"));
} catch (e) {
resolveHeaderPromise(null);
--- a/toolkit/components/extensions/test/xpcshell/test_locale_converter.js
+++ b/toolkit/components/extensions/test/xpcshell/test_locale_converter.js
@@ -58,17 +58,17 @@ add_task(async function testSynchronousC
// Test that the asynchronous converter works as expected with input
// split into multiple chunks, and a boundary in the middle of a
// replacement token.
add_task(async function testAsyncConvert() {
let listener;
let awaitResult = new Promise((resolve, reject) => {
listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamListener]),
onDataAvailable(request, context, inputStream, offset, count) {
this.resultParts.push(NetUtil.readInputStreamToString(inputStream, count));
},
onStartRequest() {
ok(!("resultParts" in this));
this.resultParts = [];
@@ -113,17 +113,17 @@ add_task(async function testInvalidUUID(
return e.result === Cr.NS_ERROR_INVALID_ARG && /Invalid context/.test(e);
};
Assert.throws(() => {
convService.convert(stream, FROM_TYPE, TO_TYPE, uri);
}, expectInvalidContextException);
Assert.throws(() => {
- let listener = {QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener])};
+ let listener = {QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamListener])};
convService.asyncConvertData(FROM_TYPE, TO_TYPE, listener, uri);
}, expectInvalidContextException);
});
// Test that an empty stream does not throw an NS_ERROR_ILLEGAL_VALUE.
add_task(async function testEmptyStream() {
--- a/toolkit/components/feeds/FeedProcessor.js
+++ b/toolkit/components/feeds/FeedProcessor.js
@@ -194,17 +194,17 @@ FeedResult.prototype = {
stylesheet: null,
registerExtensionPrefix: function FR_registerExtensionPrefix(ns, prefix) {
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
},
// XPCOM stuff
classID: FR_CLASSID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFeedResult])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFeedResult])
};
function Feed() {
this.subtitle = null;
this.title = null;
this.items = Cc[ARRAY_CONTRACTID].createInstance(Ci.nsIMutableArray);
this.link = null;
this.id = null;
@@ -366,17 +366,17 @@ Feed.prototype = {
textConstruct.text);
}
}
}
},
// XPCOM stuff
classID: FEED_CLASSID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFeed, Ci.nsIFeedContainer])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFeed, Ci.nsIFeedContainer])
};
function Entry() {
this.summary = null;
this.content = null;
this.title = null;
this.fields = Cc["@mozilla.org/hash-property-bag;1"].
createInstance(Ci.nsIWritablePropertyBag2);
@@ -576,17 +576,17 @@ Entry.prototype = {
}
this._addToEnclosures(enc);
}
},
// XPCOM stuff
classID: ENTRY_CLASSID,
- QueryInterface: XPCOMUtils.generateQI(
+ QueryInterface: ChromeUtils.generateQI(
[Ci.nsIFeedEntry, Ci.nsIFeedContainer]
)
};
Entry.prototype._atomLinksToURI = Feed.prototype._atomLinksToURI;
Entry.prototype._resolveURI = Feed.prototype._resolveURI;
Entry.prototype._resetBagMembersToRawText =
Feed.prototype._resetBagMembersToRawText;
@@ -629,17 +629,17 @@ TextConstruct.prototype = {
let flags = Ci.nsIParserUtils.SanitizerDropForms;
return this.parserUtils.parseFragment(this.text, flags, isXML,
this.base, element);
},
// XPCOM stuff
classID: TEXTCONSTRUCT_CLASSID,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFeedTextConstruct])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFeedTextConstruct])
};
// Generator represents the software that produced the feed
function Generator() {
this.lang = null;
this.agent = null;
this.version = null;
this.uri = null;
@@ -667,17 +667,17 @@ Generator.prototype = {
if (uriAttribute) {
this.agent = uriAttribute;
this.uri = strToURI(uriAttribute, this.baseURI);
}
},
// XPCOM stuff
classID: GENERATOR_CLASSID,
- QueryInterface: XPCOMUtils.generateQI(
+ QueryInterface: ChromeUtils.generateQI(
[Ci.nsIFeedGenerator, Ci.nsIFeedElementBase]
)
};
function Person() {
this.name = null;
this.uri = null;
this.email = null;
@@ -685,17 +685,17 @@ function Person() {
// nsIFeedElementBase
this.attributes = null;
this.baseURI = null;
}
Person.prototype = {
// XPCOM stuff
classID: PERSON_CLASSID,
- QueryInterface: XPCOMUtils.generateQI(
+ QueryInterface: ChromeUtils.generateQI(
[Ci.nsIFeedPerson, Ci.nsIFeedElementBase]
)
};
/**
* Map a list of fields into properties on a container.
*
* @param container An nsIFeedContainer
@@ -1718,17 +1718,17 @@ FeedProcessor.prototype = {
// send us an end element to call. RFC4287-valid feeds allow a
// more graceful way to handle this. Unfortunately, we can't count
// on compliance at this point.
this.endElement(uri, localName, qName);
},
// XPCOM stuff
classID: FP_CLASSID,
- QueryInterface: XPCOMUtils.generateQI(
+ QueryInterface: ChromeUtils.generateQI(
[Ci.nsIFeedProcessor, Ci.nsISAXContentHandler, Ci.nsISAXErrorHandler,
Ci.nsIStreamListener, Ci.nsIRequestObserver]
)
};
var components = [FeedProcessor, FeedResult, Feed, Entry,
TextConstruct, Generator, Person];
--- a/toolkit/components/gfx/SanityTest.js
+++ b/toolkit/components/gfx/SanityTest.js
@@ -253,18 +253,18 @@ var listener = {
// incidental crashes from having performed the sanity test.
annotateCrashReport(false);
}
};
function SanityTest() {}
SanityTest.prototype = {
classID: Components.ID("{f3a8ca4d-4c83-456b-aee2-6a2cbf11e9bd}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
shouldRunTest() {
// Only test gfx features if firefox has updated, or if the user has a new
// gpu or drivers.
var buildId = Services.appinfo.platformBuildID;
var gfxinfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
var hasAL = Services.prefs.getBoolPref(AL_ENABLED_PREF, false);
--- a/toolkit/components/gfx/content/gfxFrameScript.js
+++ b/toolkit/components/gfx/content/gfxFrameScript.js
@@ -49,16 +49,16 @@ const gfxFrameScript = {
addEventListener("MozAfterPaint", this);
} else {
sendAsyncMessage("gfxSanity:ContentLoaded");
}
}
},
// Needed to support web progress listener
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
Ci.nsIObserver,
]),
};
gfxFrameScript.init();
--- a/toolkit/components/mozintl/mozIntl.js
+++ b/toolkit/components/mozintl/mozIntl.js
@@ -409,12 +409,12 @@ class MozIntl {
}
}
}
return MozRelativeTimeFormat;
}
}
MozIntl.prototype.classID = Components.ID("{35ec195a-e8d0-4300-83af-c8a2cc84b4a3}");
-MozIntl.prototype.QueryInterface = XPCOMUtils.generateQI([Ci.mozIMozIntl, Ci.nsISupports]);
+MozIntl.prototype.QueryInterface = ChromeUtils.generateQI([Ci.mozIMozIntl]);
var components = [MozIntl];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/toolkit/components/mozprotocol/mozProtocolHandler.js
+++ b/toolkit/components/mozprotocol/mozProtocolHandler.js
@@ -37,12 +37,12 @@ mozProtocolHandler.prototype = {
},
newChannel(uri) {
return this.newChannel2(uri, null);
},
classID: Components.ID("{47a45e5f-691e-4799-8686-14f8d3fc0f8c}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolHandler]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIProtocolHandler]),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([mozProtocolHandler]);
--- a/toolkit/components/normandy/content/AboutPages.jsm
+++ b/toolkit/components/normandy/content/AboutPages.jsm
@@ -85,17 +85,17 @@ class AboutPage {
/**
* Unregister this about: page with XPCOM. This must be called before the
* add-on is cleaned up if the page has been registered.
*/
unregister() {
Cm.QueryInterface(Ci.nsIComponentRegistrar).unregisterFactory(this.classId, this);
}
}
-AboutPage.prototype.QueryInterface = XPCOMUtils.generateQI([Ci.nsIAboutModule]);
+AboutPage.prototype.QueryInterface = ChromeUtils.generateQI([Ci.nsIAboutModule]);
/**
* The module exported by this file.
*/
var AboutPages = {
async init() {
// Load scripts in content processes and tabs
Services.ppmm.loadProcessScript(PROCESS_SCRIPT, true);
--- a/toolkit/components/nsDefaultCLH.js
+++ b/toolkit/components/nsDefaultCLH.js
@@ -33,17 +33,17 @@ function getDirectoryService() {
}
function nsDefaultCLH() { }
nsDefaultCLH.prototype = {
classID: Components.ID("{6ebc941a-f2ff-4d56-b3b6-f7d0b9d73344}"),
/* nsISupports */
- QueryInterface: XPCOMUtils.generateQI([nsICommandLineHandler]),
+ QueryInterface: ChromeUtils.generateQI([nsICommandLineHandler]),
/* nsICommandLineHandler */
handle: function clh_handle(cmdLine) {
var printDir;
while ((printDir = cmdLine.handleFlagWithParam("print-xpcom-dir", false))) {
var out = "print-xpcom-dir(\"" + printDir + "\"): ";
try {
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -40,20 +40,20 @@ Services.cpmm.addMessageListener("clearR
LoginRecipesContent._clearRecipeCache();
});
// These mirror signon.* prefs.
var gEnabled, gAutofillForms, gStoreWhenAutocompleteOff;
var gLastRightClickTimeStamp = Number.NEGATIVE_INFINITY;
var observer = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsIFormSubmitObserver,
- Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsIFormSubmitObserver,
+ Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference]),
// nsIFormSubmitObserver
notify(formElement, aWindow, actionURI) {
log("observer notified for form submission.");
// We're invoked before the content's |onsubmit| handlers, so we
// can grab form data before it might be modified (see bug 257781).
@@ -1454,18 +1454,18 @@ function UserAutoCompleteResult(aSearchS
if (this.matchCount > 0) {
this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
this.defaultIndex = 0;
}
}
UserAutoCompleteResult.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteResult,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteResult,
+ Ci.nsISupportsWeakReference]),
// private
logins: null,
// Allow autoCompleteSearch to get at the JS object so it can
// modify some readonly properties for internal use.
get wrappedJSObject() {
return this;
--- a/toolkit/components/passwordmgr/LoginManagerParent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerParent.jsm
@@ -176,18 +176,18 @@ var LoginManagerParent = {
}
// If we're currently displaying a master password prompt, defer
// processing this form until the user handles the prompt.
if (Services.logins.uiBusy) {
log("deferring sendLoginDataToChild for", formOrigin);
let self = this;
let observer = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
log("Got deferred sendLoginDataToChild notification:", topic);
// Only run observer once.
Services.obs.removeObserver(this, "passwordmgr-crypto-login");
Services.obs.removeObserver(this, "passwordmgr-crypto-loginCanceled");
if (topic == "passwordmgr-crypto-loginCanceled") {
target.sendAsyncMessage("RemoteLogins:loginsFound", {
--- a/toolkit/components/passwordmgr/crypto-SDR.js
+++ b/toolkit/components/passwordmgr/crypto-SDR.js
@@ -10,17 +10,17 @@ ChromeUtils.defineModuleGetter(this, "Lo
function LoginManagerCrypto_SDR() {
this.init();
}
LoginManagerCrypto_SDR.prototype = {
classID: Components.ID("{dc6c2976-0f73-4f1f-b9ff-3d72b4e28309}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsILoginManagerCrypto]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsILoginManagerCrypto]),
__decoderRing: null, // nsSecretDecoderRing service
get _decoderRing() {
if (!this.__decoderRing)
this.__decoderRing = Cc["@mozilla.org/security/sdr;1"].
getService(Ci.nsISecretDecoderRing);
return this.__decoderRing;
},
--- a/toolkit/components/passwordmgr/nsLoginInfo.js
+++ b/toolkit/components/passwordmgr/nsLoginInfo.js
@@ -8,17 +8,17 @@ ChromeUtils.defineModuleGetter(this, "Lo
"resource://gre/modules/LoginHelper.jsm");
function nsLoginInfo() {}
nsLoginInfo.prototype = {
classID: Components.ID("{0f2f347c-1e4f-40cc-8efd-792dea70a85e}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsILoginInfo, Ci.nsILoginMetaInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsILoginInfo, Ci.nsILoginMetaInfo]),
//
// nsILoginInfo interfaces...
//
hostname: null,
formSubmitURL: null,
httpRealm: null,
--- a/toolkit/components/passwordmgr/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/nsLoginManager.js
@@ -30,19 +30,19 @@ const MS_PER_DAY = 24 * 60 * 60 * 1000;
function LoginManager() {
this.init();
}
LoginManager.prototype = {
classID: Components.ID("{cb9e0de8-3598-4ed7-857b-827f011ad5d8}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsILoginManager,
- Ci.nsISupportsWeakReference,
- Ci.nsIInterfaceRequestor]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsILoginManager,
+ Ci.nsISupportsWeakReference,
+ Ci.nsIInterfaceRequestor]),
getInterface(aIID) {
if (aIID.equals(Ci.mozIStorageConnection) && this._storage) {
let ir = this._storage.QueryInterface(Ci.nsIInterfaceRequestor);
return ir.getInterface(aIID);
}
if (aIID.equals(Ci.nsIVariant)) {
// Allows unwrapping the JavaScript object for regression tests.
@@ -133,18 +133,18 @@ LoginManager.prototype = {
/**
* Internal utility object, implements the nsIObserver interface.
* Used to receive notification for: form submission, preference changes.
*/
_observer: {
_pwmgr: null,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
// nsIObserver
observe(subject, topic, data) {
if (topic == "nsPref:changed") {
var prefName = data;
log.debug("got change to", prefName, "preference");
if (prefName == "rememberSignons") {
--- a/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
+++ b/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
@@ -34,17 +34,17 @@ function LoginManagerPromptFactory() {
Services.obs.addObserver(this, "quit-application-granted", true);
Services.obs.addObserver(this, "passwordmgr-crypto-login", true);
Services.obs.addObserver(this, "passwordmgr-crypto-loginCanceled", true);
}
LoginManagerPromptFactory.prototype = {
classID: Components.ID("{749e62f4-60ae-4569-a8a2-de78b649660e}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIObserver, Ci.nsISupportsWeakReference]),
_asyncPrompts: {},
_asyncPromptInProgress: false,
observe(subject, topic, data) {
this.log("Observed: " + topic);
if (topic == "quit-application-granted") {
this._cancelPendingPrompts();
@@ -235,19 +235,19 @@ XPCOMUtils.defineLazyGetter(this.LoginMa
* nsILoginManagerPrompter: Used by Login Manager for saving/changing logins
* found in HTML forms.
*/
function LoginManagerPrompter() {}
LoginManagerPrompter.prototype = {
classID: Components.ID("{8aa66d77-1bbb-45a6-991e-b8f47751c291}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt,
- Ci.nsIAuthPrompt2,
- Ci.nsILoginManagerPrompter]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAuthPrompt,
+ Ci.nsIAuthPrompt2,
+ Ci.nsILoginManagerPrompter]),
_factory: null,
_chromeWindow: null,
_browser: null,
_opener: null,
__strBundle: null, // String bundle for L10N
get _strBundle() {
@@ -1661,17 +1661,17 @@ LoginManagerPrompter.prototype = {
} else {
aAuthInfo.username = username;
}
aAuthInfo.password = password;
},
_newAsyncPromptConsumer(aCallback, aContext) {
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
callback: aCallback,
context: aContext,
cancel() {
this.callback.onAuthCancelled(this.context, false);
this.callback = null;
this.context = null;
}
};
--- a/toolkit/components/passwordmgr/storage-json.js
+++ b/toolkit/components/passwordmgr/storage-json.js
@@ -23,17 +23,17 @@ ChromeUtils.defineModuleGetter(this, "OS
XPCOMUtils.defineLazyServiceGetter(this, "gUUIDGenerator",
"@mozilla.org/uuid-generator;1",
"nsIUUIDGenerator");
this.LoginManagerStorage_json = function() {};
this.LoginManagerStorage_json.prototype = {
classID: Components.ID("{c00c432d-a0c9-46d7-bef6-9c45b4d07341}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsILoginManagerStorage]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsILoginManagerStorage]),
__crypto: null, // nsILoginManagerCrypto service
get _crypto() {
if (!this.__crypto)
this.__crypto = Cc["@mozilla.org/login-manager/crypto/SDR;1"].
getService(Ci.nsILoginManagerCrypto);
return this.__crypto;
},
--- a/toolkit/components/passwordmgr/storage-mozStorage.js
+++ b/toolkit/components/passwordmgr/storage-mozStorage.js
@@ -41,18 +41,18 @@ Transaction.prototype = {
};
function LoginManagerStorage_mozStorage() { }
LoginManagerStorage_mozStorage.prototype = {
classID: Components.ID("{8c2023b9-175c-477e-9761-44ae7b549756}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsILoginManagerStorage,
- Ci.nsIInterfaceRequestor]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsILoginManagerStorage,
+ Ci.nsIInterfaceRequestor]),
getInterface(aIID) {
if (aIID.equals(Ci.nsIVariant)) {
// Allows unwrapping the JavaScript object for regression tests.
return this;
}
if (aIID.equals(Ci.mozIStorageConnection)) {
return this._dbConnection;
--- a/toolkit/components/passwordmgr/test/browser/browser_hasInsecureLoginForms_streamConverter.js
+++ b/toolkit/components/passwordmgr/test/browser/browser_hasInsecureLoginForms_streamConverter.js
@@ -12,17 +12,17 @@ function registerConverter() {
* HTML viewer page containing the "form_basic.html" code. The viewer is
* served from a "resource:" URI while keeping the "resource:" principal.
*/
function TestStreamConverter() {}
TestStreamConverter.prototype = {
classID: Components.ID("{5f01d6ef-c090-45a4-b3e5-940d64713eb7}"),
contractID: "@mozilla.org/streamconv;1?from=test/content&to=*/*",
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIRequestObserver,
Ci.nsIStreamListener,
Ci.nsIStreamConverter,
]),
// nsIStreamConverter
convert() {},
--- a/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html
@@ -104,17 +104,17 @@
let login2 = parentCc["@mozilla.org/login-manager/loginInfo;1"].
createInstance(parentCi.nsILoginInfo);
login2.init("http://mochi.test:8888", null, "mochirealm", "user1name",
"user1pass", "", "");
Services.logins.addLogin(login2);
sendAsyncMessage("setupDone");
},
- QueryInterface: XPCOMUtils.generateQI([parentCi.nsIProtocolProxyCallback]),
+ QueryInterface: ChromeUtils.generateQI([parentCi.nsIProtocolProxyCallback]),
});
addMessageListener("prepareForNextTest", message => {
parentCc["@mozilla.org/network/http-auth-manager;1"].
getService(parentCi.nsIHttpAuthManager).
clearAll();
sendAsyncMessage("prepareForNextTestDone");
});
--- a/toolkit/components/passwordmgr/test/unit/test_notifications.js
+++ b/toolkit/components/passwordmgr/test/unit/test_notifications.js
@@ -1,17 +1,17 @@
/*
* Tests notifications dispatched when modifying stored logins.
*/
var expectedNotification;
var expectedData;
var TestObserver = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
Assert.equal(topic, "passwordmgr-storage-changed");
Assert.equal(data, expectedNotification);
switch (data) {
case "addLogin":
Assert.ok(subject instanceof Ci.nsILoginInfo);
--- a/toolkit/components/payments/content/paymentDialogWrapper.js
+++ b/toolkit/components/payments/content/paymentDialogWrapper.js
@@ -33,17 +33,17 @@ XPCOMUtils.defineLazyGetter(this, "formA
});
var paymentDialogWrapper = {
componentsLoaded: new Map(),
frame: null,
mm: null,
request: null,
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
]),
/**
* Note: This method is async because formAutofillStorage plans to become async.
*
* @param {string} guid
--- a/toolkit/components/payments/paymentUIService.js
+++ b/toolkit/components/payments/paymentUIService.js
@@ -32,17 +32,17 @@ function PaymentUIService() {
prefix: "Payment UI Service",
});
});
this.log.debug("constructor");
}
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-",
// nsIPaymentUIService implementation:
showPayment(requestId) {
this.log.debug("showPayment:", requestId);
let chromeWindow = Services.wm.getMostRecentWindow("navigator:browser");
--- a/toolkit/components/places/ColorAnalyzer.js
+++ b/toolkit/components/places/ColorAnalyzer.js
@@ -74,12 +74,12 @@ ColorAnalyzer.prototype = {
onWorkerError: function ColorAnalyzer_onWorkerError(error) {
// this shouldn't happen, but just in case
error.preventDefault();
Cu.reportError("ColorAnalyzer worker: " + error.message);
this.callbacks.shift().onComplete(false);
},
classID: Components.ID("{d056186c-28a0-494e-aacc-9e433772b143}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.mozIColorAnalyzer])
+ QueryInterface: ChromeUtils.generateQI([Ci.mozIColorAnalyzer])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ColorAnalyzer]);
--- a/toolkit/components/places/PageIconProtocolHandler.js
+++ b/toolkit/components/places/PageIconProtocolHandler.js
@@ -119,15 +119,15 @@ PageIconProtocolHandler.prototype = {
return this.newChannel2(uri, null);
},
allowPort(port, scheme) {
return false;
},
classID: Components.ID("{60a1f7c6-4ff9-4a42-84d3-5a185faa6f32}"),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIProtocolHandler,
Ci.nsISupportsWeakReference,
])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PageIconProtocolHandler]);
--- a/toolkit/components/places/PlacesCategoriesStarter.js
+++ b/toolkit/components/places/PlacesCategoriesStarter.js
@@ -50,15 +50,15 @@ PlacesCategoriesStarter.prototype = {
break;
default:
throw new Error("Trying to handle an unknown category.");
}
},
classID: Components.ID("803938d5-e26d-4453-bf46-ad4b26e41114"),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(PlacesCategoriesStarter),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
])
};
var components = [PlacesCategoriesStarter];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/toolkit/components/places/PlacesSearchAutocompleteProvider.jsm
+++ b/toolkit/components/places/PlacesSearchAutocompleteProvider.jsm
@@ -116,18 +116,18 @@ const SearchAutocompleteProviderInternal
return null;
}
return new SearchSuggestionControllerWrapper(engine, searchToken,
inPrivateContext,
maxLocalResults, maxRemoteResults,
userContextId);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
};
function SearchSuggestionControllerWrapper(engine, searchToken,
inPrivateContext,
maxLocalResults, maxRemoteResults,
userContextId) {
this._controller = new SearchSuggestionController();
this._controller.maxLocalResults = maxLocalResults;
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -690,17 +690,17 @@ var PlacesUtils = {
throw new Error(`${name}: The following properties were expected: ${[...required].join(", ")}`);
return normalizedInput;
},
BOOKMARK_VALIDATORS,
SYNC_BOOKMARK_VALIDATORS,
SYNC_CHANGE_RECORD_VALIDATORS,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
_shutdownFunctions: [],
registerShutdownFunction: function PU_registerShutdownFunction(aFunc) {
// If this is the first registered function, add the shutdown observer.
if (this._shutdownFunctions.length == 0) {
Services.obs.addObserver(this, this.TOPIC_SHUTDOWN);
}
this._shutdownFunctions.push(aFunc);
@@ -2681,17 +2681,17 @@ var GuidHelper = {
},
onItemRemoved:
(aItemId, aParentId, aIndex, aItemTyep, aURI, aGuid, aParentGuid) => {
this.guidsForIds.delete(aItemId);
this.idsForGuids.delete(aGuid);
this.updateCache(aParentId, aParentGuid);
},
- QueryInterface: XPCOMUtils.generateQI(Ci.nsINavBookmarkObserver),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver]),
onBeginUpdateBatch() {},
onEndUpdateBatch() {},
onItemChanged() {},
onItemVisited() {},
onItemMoved() {},
};
PlacesUtils.bookmarks.addObserver(this.observer);
--- a/toolkit/components/places/UnifiedComplete.js
+++ b/toolkit/components/places/UnifiedComplete.js
@@ -590,17 +590,17 @@ XPCOMUtils.defineLazyGetter(this, "Prefs
this._map.delete("suggest.history.onlyTyped");
}
if (pref == "autocomplete.enabled" || pref.startsWith("suggest.")) {
this._map.delete("defaultBehavior");
this._map.delete("emptySearchDefaultBehavior");
updateLinkedPrefs(pref);
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference
])
};
Services.prefs.addObserver(PREF_URLBAR_BRANCH, store, true);
Services.prefs.addObserver("keyword.enabled", store, true);
// On startup we must check that some prefs are linked.
@@ -813,17 +813,17 @@ function Search(searchString, searchPara
.createInstance(Ci.nsIAutoCompleteSimpleResult);
result.setSearchString(searchString);
result.setListener({
onValueRemoved(result, spec, removeFromDB) {
if (removeFromDB) {
PlacesUtils.history.remove(spec).catch(Cu.reportError);
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIAutoCompleteSimpleResultListener
])
});
// Will be set later, if needed.
result.setDefaultIndex(-1);
this._result = result;
this._previousSearchMatchTypes = [];
@@ -2652,17 +2652,17 @@ UnifiedComplete.prototype = {
},
// nsISupports
classID: Components.ID("f964a319-397a-4d21-8be6-5cdd1ee3e3ae"),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(UnifiedComplete),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIAutoCompleteSearch,
Ci.nsIAutoCompleteSearchDescriptor,
Ci.mozIPlacesAutoComplete,
Ci.nsIObserver,
Ci.nsISupportsWeakReference
])
};
--- a/toolkit/components/places/nsLivemarkService.js
+++ b/toolkit/components/places/nsLivemarkService.js
@@ -423,17 +423,17 @@ LivemarkService.prototype = {
},
// nsISupports
classID: Components.ID("{dca61eb5-c7cd-4df1-b0fb-d0722baba251}"),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(LivemarkService),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.mozIAsyncLivemarks,
Ci.nsINavBookmarkObserver,
Ci.nsINavHistoryObserver,
Ci.nsIObserver,
Ci.nsISupportsWeakReference
])
};
@@ -661,17 +661,17 @@ Livemark.prototype = {
return now;
},
get lastModified() {
return now;
},
get tags() {
return PlacesUtils.tagging.getTagsForURI(NetUtil.newURI(this.uri)).join(", ");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryResultNode])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryResultNode])
};
nodes.push(node);
}
this._nodes.set(aContainerNode, nodes);
return nodes;
},
registerForUpdates(aContainerNode, aResultObserver) {
@@ -737,17 +737,17 @@ Livemark.prototype = {
abort() {
this.status = Ci.mozILivemark.STATUS_FAILED;
if (this.loadGroup) {
this.loadGroup.cancel(Cr.NS_BINDING_ABORTED);
this.loadGroup = null;
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.mozILivemark
])
};
// LivemarkLoadListener
/**
* Object used internally to handle loading a livemark's contents.
@@ -896,17 +896,17 @@ LivemarkLoadListener.prototype = {
},
// nsIInterfaceRequestor
getInterface(aIID) {
return this.QueryInterface(aIID);
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIFeedResultListener,
Ci.nsIStreamListener,
Ci.nsIRequestObserver,
Ci.nsIInterfaceRequestor
])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([LivemarkService]);
--- a/toolkit/components/places/nsPlacesExpiration.js
+++ b/toolkit/components/places/nsPlacesExpiration.js
@@ -988,17 +988,17 @@ nsPlacesExpiration.prototype = {
},
// nsISupports
classID: Components.ID("705a423f-2f69-42f3-b9fe-1517e0dee56f"),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(nsPlacesExpiration),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsINavHistoryObserver,
Ci.nsITimerCallback,
Ci.mozIStorageStatementCallback,
Ci.nsISupportsWeakReference
])
};
--- a/toolkit/components/places/nsTaggingService.js
+++ b/toolkit/components/places/nsTaggingService.js
@@ -450,17 +450,17 @@ TaggingService.prototype = {
onEndUpdateBatch() {},
// nsISupports
classID: Components.ID("{bbc23860-2553-479d-8b78-94d9038334f7}"),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(TaggingService),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsITaggingService,
Ci.nsINavBookmarkObserver,
Ci.nsIObserver
])
};
// Implements nsIAutoCompleteSearch
function TagAutoCompleteSearch() {
@@ -546,15 +546,15 @@ TagAutoCompleteSearch.prototype = {
resultCode += "_ONGOING";
}
result.setSearchResult(Ci.nsIAutoCompleteResult[resultCode]);
listener.onSearchResult(this, result);
},
classID: Components.ID("{1dcc23b0-d4cb-11dc-9ad6-479d56d89593}"),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(TagAutoCompleteSearch),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIAutoCompleteSearch
])
};
var component = [TaggingService, TagAutoCompleteSearch];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(component);
--- a/toolkit/components/places/tests/PlacesTestUtils.jsm
+++ b/toolkit/components/places/tests/PlacesTestUtils.jsm
@@ -319,17 +319,17 @@ var PlacesTestUtils = Object.freeze({
waitForNotification(notification, conditionFn = () => true, type = "bookmarks") {
let iface = type == "bookmarks" ? Ci.nsINavBookmarkObserver
: Ci.nsINavHistoryObserver;
return new Promise(resolve => {
let proxifiedObserver = new Proxy({}, {
get: (target, name) => {
if (name == "QueryInterface")
- return XPCOMUtils.generateQI([iface]);
+ return ChromeUtils.generateQI([iface]);
if (name == notification)
return (...args) => {
if (conditionFn.apply(this, args)) {
PlacesUtils[type].removeObserver(proxifiedObserver);
resolve();
}
};
if (name == "skipTags" || name == "skipDescendantsOnItemRemoval") {
--- a/toolkit/components/places/tests/bookmarks/test_nsINavBookmarkObserver.js
+++ b/toolkit/components/places/tests/bookmarks/test_nsINavBookmarkObserver.js
@@ -43,17 +43,17 @@ var gBookmarksObserver = {
onItemVisited() {
return this.validate("onItemVisited", arguments);
},
onItemMoved() {
return this.validate("onItemMoved", arguments);
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]),
};
var gBookmarkSkipObserver = {
skipTags: true,
skipDescendantsOnItemRemoval: true,
expected: null,
setup(expected) {
@@ -87,17 +87,17 @@ var gBookmarkSkipObserver = {
onItemVisited() {
return this.validate("onItemVisited", arguments);
},
onItemMoved() {
return this.validate("onItemMoved", arguments);
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]),
};
add_task(function setup() {
PlacesUtils.bookmarks.addObserver(gBookmarksObserver);
PlacesUtils.bookmarks.addObserver(gBookmarkSkipObserver);
});
--- a/toolkit/components/places/tests/browser/browser_bug399606.js
+++ b/toolkit/components/places/tests/browser/browser_bug399606.js
@@ -28,17 +28,17 @@ add_task(async function() {
},
onBeginUpdateBatch() {},
onEndUpdateBatch() {},
onTitleChanged() {},
onDeleteURI() {},
onClearHistory() {},
onPageChanged() {},
onDeleteVisits() {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver])
};
async function promiseLoadedThreeTimes(uri) {
historyObserver.count = 0;
historyObserver.expectedURI = Services.io.newURI(uri);
let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
PlacesUtils.history.addObserver(historyObserver);
gBrowser.loadURI(uri);
--- a/toolkit/components/places/tests/browser/browser_bug646422.js
+++ b/toolkit/components/places/tests/browser/browser_bug646422.js
@@ -23,17 +23,17 @@ add_task(async function() {
onBeginUpdateBatch() { },
onEndUpdateBatch() { },
onVisits() { },
onDeleteURI() { },
onClearHistory() { },
onPageChanged() { },
onDeleteVisits() { },
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver])
};
PlacesUtils.history.addObserver(observer);
});
await ContentTask.spawn(tab.linkedBrowser, null, async function() {
let title = content.document.title;
content.history.pushState("", "", "new_page");
--- a/toolkit/components/places/tests/browser/browser_notfound.js
+++ b/toolkit/components/places/tests/browser/browser_notfound.js
@@ -38,17 +38,17 @@ add_task(async function() {
},
onBeginUpdateBatch() {},
onEndUpdateBatch() {},
onTitleChanged() {},
onDeleteURI() {},
onClearHistory() {},
onPageChanged() {},
onDeleteVisits() {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver])
};
PlacesUtils.history.addObserver(historyObserver);
});
let newTabPromise = BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
await Promise.all([visitedPromise, newTabPromise]);
await PlacesUtils.history.clear();
--- a/toolkit/components/places/tests/browser/browser_settitle.js
+++ b/toolkit/components/places/tests/browser/browser_settitle.js
@@ -37,17 +37,17 @@ add_task(async function() {
PlacesUtils.history.removeObserver(this);
resolve(this.data);
},
onDeleteURI() {},
onClearHistory() {},
onPageChanged() {},
onDeleteVisits() {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver])
};
PlacesUtils.history.addObserver(historyObserver);
});
const url1 = "http://example.com/tests/toolkit/components/places/tests/browser/title1.html";
await BrowserTestUtils.openNewForegroundTab(gBrowser, url1);
const url2 = "http://example.com/tests/toolkit/components/places/tests/browser/title2.html";
--- a/toolkit/components/places/tests/browser/head.js
+++ b/toolkit/components/places/tests/browser/head.js
@@ -79,17 +79,17 @@ NavHistoryObserver.prototype = {
onBeginUpdateBatch() {},
onEndUpdateBatch() {},
onVisits() {},
onTitleChanged() {},
onDeleteURI() {},
onClearHistory() {},
onPageChanged() {},
onDeleteVisits() {},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavHistoryObserver,
])
};
/**
* Asynchronously adds visits to a page, invoking a callback function when done.
*
* @param aPlaceInfo
--- a/toolkit/components/places/tests/chrome/test_371798.xul
+++ b/toolkit/components/places/tests/chrome/test_371798.xul
@@ -32,17 +32,17 @@ function promiseOnItemChanged() {
onItemVisited() {},
onItemMoved() {},
onItemChanged() {
PlacesUtils.bookmarks.removeObserver(this);
resolve();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavBookmarkObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver])
});
});
}
(async function() {
// add 2 bookmarks to the toolbar, same URI, different titles (set later)
let bm1 = await PlacesUtils.bookmarks.insert({
parentGuid: PlacesUtils.bookmarks.toolbarGuid,
--- a/toolkit/components/places/tests/head_common.js
+++ b/toolkit/components/places/tests/head_common.js
@@ -733,17 +733,17 @@ function NavBookmarkObserver() {}
NavBookmarkObserver.prototype = {
onBeginUpdateBatch() {},
onEndUpdateBatch() {},
onItemAdded() {},
onItemRemoved() {},
onItemChanged() {},
onItemVisited() {},
onItemMoved() {},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver,
])
};
/**
* Generic nsINavHistoryObserver that doesn't implement anything, but provides
* dummy methods to prevent errors about an object not having a certain method.
*/
@@ -753,17 +753,17 @@ NavHistoryObserver.prototype = {
onBeginUpdateBatch() {},
onEndUpdateBatch() {},
onVisits() {},
onTitleChanged() {},
onDeleteURI() {},
onClearHistory() {},
onPageChanged() {},
onDeleteVisits() {},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavHistoryObserver,
])
};
/**
* Generic nsINavHistoryResultObserver that doesn't implement anything, but
* provides dummy methods to prevent errors about an object not having a certain
* method.
@@ -782,17 +782,17 @@ NavHistoryResultObserver.prototype = {
nodeKeywordChanged() {},
nodeLastModifiedChanged() {},
nodeMoved() {},
nodeRemoved() {},
nodeTagsChanged() {},
nodeTitleChanged() {},
nodeURIChanged() {},
sortingChanged() {},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavHistoryResultObserver,
])
};
function checkBookmarkObject(info) {
do_check_valid_places_guid(info.guid);
do_check_valid_places_guid(info.parentGuid);
Assert.ok(typeof info.index == "number", "index should be a number");
--- a/toolkit/components/places/tests/legacy/test_bookmarks.js
+++ b/toolkit/components/places/tests/legacy/test_bookmarks.js
@@ -59,17 +59,17 @@ var bookmarksObserver = {
onItemMoved(id, oldParent, oldIndex, newParent, newIndex,
itemType) {
this._itemMovedId = id;
this._itemMovedOldParent = oldParent;
this._itemMovedOldIndex = oldIndex;
this._itemMovedNewParent = newParent;
this._itemMovedNewIndex = newIndex;
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver,
])
};
// Get bookmarks menu folder id.
var root = bs.bookmarksMenuFolder;
// Index at which items should begin.
--- a/toolkit/components/places/tests/sync/head_sync.js
+++ b/toolkit/components/places/tests/sync/head_sync.js
@@ -217,17 +217,17 @@ BookmarkObserver.prototype = {
oldParentGuid, newParentGuid, source) {
this.notifications.push({
name: "onItemMoved",
params: { itemId, oldParentId, oldIndex, newParentId, newIndex, type,
guid, oldParentGuid, newParentGuid, source },
});
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver,
]),
check(expectedNotifications) {
PlacesUtils.bookmarks.removeObserver(this);
if (!ObjectUtils.deepEqual(this.notifications, expectedNotifications)) {
info(`Expected notifications: ${JSON.stringify(expectedNotifications)}`);
info(`Actual notifications: ${JSON.stringify(this.notifications)}`);
--- a/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
+++ b/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
@@ -45,17 +45,17 @@ registerCleanupFunction(cleanup);
*/
function AutoCompleteInput(aSearches) {
this.searches = aSearches;
}
AutoCompleteInput.prototype = {
popup: {
selectedIndex: -1,
invalidate() {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompletePopup])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompletePopup])
},
popupOpen: false,
disableAutoComplete: false,
completeDefaultIndex: true,
completeSelectedIndex: true,
forceComplete: false,
@@ -88,17 +88,17 @@ AutoCompleteInput.prototype = {
},
onSearchBegin() {},
onSearchComplete() {},
onTextEntered: () => false,
onTextReverted: () => false,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteInput])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteInput])
};
/**
* A helper for check_autocomplete to check a specific match against data from
* the controller.
*
* @param {Object} match The expected match for the result, in the following form:
* {
--- a/toolkit/components/places/tests/unifiedcomplete/test_history_autocomplete_tags.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_history_autocomplete_tags.js
@@ -34,21 +34,21 @@ AutoCompleteInput.prototype = {
popupOpen: false,
popup: {
setSelectedIndex(aIndex) {},
invalidate() {},
// nsISupports implementation
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompletePopup])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompletePopup])
},
// nsISupports implementation
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteInput])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteInput])
};
// Get tagging service
try {
var tagssvc = Cc["@mozilla.org/browser/tagging-service;1"].
getService(Ci.nsITaggingService);
} catch (ex) {
do_throw("Could not get tagging service\n");
--- a/toolkit/components/places/tests/unit/test_adaptive.js
+++ b/toolkit/components/places/tests/unit/test_adaptive.js
@@ -54,20 +54,20 @@ AutoCompleteInput.prototype = {
onSearchComplete() {},
get popupOpen() {
return false;
},
popup: {
set selectedIndex(aIndex) {},
invalidate() {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompletePopup])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompletePopup])
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteInput])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteInput])
};
/**
* Checks that autocomplete results are ordered correctly.
*/
function ensure_results(expected, searchTerm, callback) {
let controller = Cc["@mozilla.org/autocomplete/controller;1"].
getService(Ci.nsIAutoCompleteController);
@@ -102,19 +102,19 @@ async function task_setCountRank(aURI, a
let visits = [];
for (let i = 0; i < aCount; i++) {
visits.push({ uri: aURI, visitDate: d1, transition: TRANSITION_TYPED });
}
await PlacesTestUtils.addVisits(visits);
// Make a nsIAutoCompleteController and friends for instrumentation feedback.
let thing = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteInput,
- Ci.nsIAutoCompletePopup,
- Ci.nsIAutoCompleteController]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteInput,
+ Ci.nsIAutoCompletePopup,
+ Ci.nsIAutoCompleteController]),
get popup() {
return thing;
},
get controller() {
return thing;
},
popupOpen: true,
selectedIndex: 0,
--- a/toolkit/components/places/tests/unit/test_adaptive_bug527311.js
+++ b/toolkit/components/places/tests/unit/test_adaptive_bug527311.js
@@ -98,19 +98,19 @@ function addAdaptiveFeedback(aUrl, aSear
observe(aSubject, aTopic, aData) {
Services.obs.removeObserver(observer, PLACES_AUTOCOMPLETE_FEEDBACK_UPDATED_TOPIC);
do_timeout(0, resolve);
}
};
Services.obs.addObserver(observer, PLACES_AUTOCOMPLETE_FEEDBACK_UPDATED_TOPIC);
let thing = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteInput,
- Ci.nsIAutoCompletePopup,
- Ci.nsIAutoCompleteController]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteInput,
+ Ci.nsIAutoCompletePopup,
+ Ci.nsIAutoCompleteController]),
get popup() { return thing; },
get controller() { return thing; },
popupOpen: true,
selectedIndex: 0,
getValueAt: () => aUrl,
searchString: aSearch
};
--- a/toolkit/components/places/tests/unit/test_bug636917_isLivemark.js
+++ b/toolkit/components/places/tests/unit/test_bug636917_isLivemark.js
@@ -6,17 +6,17 @@ add_task(async function() {
if (name == PlacesUtils.LMANNO_FEEDURI) {
PlacesUtils.annotations.removeObserver(this);
resolve();
}
},
onItemAnnotationRemoved() {},
onPageAnnotationSet() {},
onPageAnnotationRemoved() {},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIAnnotationObserver
]),
};
PlacesUtils.annotations.addObserver(annoObserver);
});
let livemark = await PlacesUtils.livemarks.addLivemark(
--- a/toolkit/components/places/tests/unit/test_history_observer.js
+++ b/toolkit/components/places/tests/unit/test_history_observer.js
@@ -11,17 +11,17 @@ NavHistoryObserver.prototype = {
onBeginUpdateBatch() { },
onEndUpdateBatch() { },
onVisits() { },
onTitleChanged() { },
onDeleteURI() { },
onClearHistory() { },
onPageChanged() { },
onDeleteVisits() { },
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver])
};
/**
* Registers a one-time history observer for and calls the callback
* when the specified nsINavHistoryObserver method is called.
* Returns a promise that is resolved when the callback returns.
*/
function onNotify(callback) {
--- a/toolkit/components/places/tests/unit/test_onItemChanged_tags.js
+++ b/toolkit/components/places/tests/unit/test_onItemChanged_tags.js
@@ -13,17 +13,17 @@ add_task(async function run_test() {
url: uri,
title: "Bookmark 1"
});
PlacesUtils.tagging.tagURI(uri, tags);
let promise = PromiseUtils.defer();
let bookmarksObserver = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsINavBookmarkObserver
]),
_changedCount: 0,
onItemChanged(aItemId, aProperty, aIsAnnotationProperty, aValue,
aLastModified, aItemType, aParentId, aGuid) {
if (aProperty == "tags") {
Assert.equal(aGuid, bookmark.guid);
--- a/toolkit/components/privatebrowsing/PrivateBrowsingTrackingProtectionWhitelist.js
+++ b/toolkit/components/privatebrowsing/PrivateBrowsingTrackingProtectionWhitelist.js
@@ -9,20 +9,17 @@ function PrivateBrowsingTrackingProtecti
// The list of URIs explicitly excluded from tracking protection.
this._allowlist = [];
Services.obs.addObserver(this, "last-pb-context-exited", true);
}
PrivateBrowsingTrackingProtectionWhitelist.prototype = {
classID: Components.ID("{a319b616-c45d-4037-8d86-01c592b5a9af}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrivateBrowsingTrackingProtectionWhitelist,
- Ci.nsIObserver,
- Ci.nsISupportsWeakReference,
- Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrivateBrowsingTrackingProtectionWhitelist, Ci.nsIObserver, Ci.nsISupportsWeakReference]),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(PrivateBrowsingTrackingProtectionWhitelist),
/**
* Add the provided URI to the list of allowed tracking sites.
*
* @param uri nsIURI
* The URI to add to the list.
*/
--- a/toolkit/components/processsingleton/ContentProcessSingleton.js
+++ b/toolkit/components/processsingleton/ContentProcessSingleton.js
@@ -10,18 +10,18 @@ ChromeUtils.import("resource://gre/modul
XPCOMUtils.defineLazyModuleGetters(this, {
GeckoViewTelemetryController: "resource://gre/modules/GeckoViewTelemetryController.jsm",
TelemetryController: "resource://gre/modules/TelemetryController.jsm",
});
function ContentProcessSingleton() {}
ContentProcessSingleton.prototype = {
classID: Components.ID("{ca2a8470-45c7-11e4-916c-0800200c9a66}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
switch (topic) {
case "app-startup": {
Services.obs.addObserver(this, "xpcom-shutdown");
// Initialize Telemetry in the content process: use a different
// controller depending on the platform.
if (Services.prefs.getBoolPref("toolkit.telemetry.isGeckoViewMode", false)) {
--- a/toolkit/components/processsingleton/MainProcessSingleton.js
+++ b/toolkit/components/processsingleton/MainProcessSingleton.js
@@ -8,18 +8,18 @@ ChromeUtils.import("resource://gre/modul
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.defineModuleGetter(this, "NetUtil",
"resource://gre/modules/NetUtil.jsm");
function MainProcessSingleton() {}
MainProcessSingleton.prototype = {
classID: Components.ID("{0636a680-45cb-11e4-916c-0800200c9a66}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
// Called when a webpage calls window.external.AddSearchProvider
addSearchEngine({ target: browser, data: { pageURL, engineURL } }) {
pageURL = NetUtil.newURI(pageURL);
engineURL = NetUtil.newURI(engineURL, null, pageURL);
let iconURL;
let tabbrowser = browser.getTabBrowser();
--- a/toolkit/components/prompts/src/nsPrompter.js
+++ b/toolkit/components/prompts/src/nsPrompter.js
@@ -9,17 +9,17 @@ ChromeUtils.import("resource://gre/modul
ChromeUtils.import("resource://gre/modules/SharedPromptUtils.jsm");
function Prompter() {
// Note that EmbedPrompter clones this implementation.
}
Prompter.prototype = {
classID: Components.ID("{1c978d25-b37f-43a8-a2d6-0c7a239ead87}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIPromptService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIPromptService]),
/* ---------- private members ---------- */
pickPrompter(domWin) {
return new ModalPrompter(domWin);
},
@@ -510,19 +510,19 @@ ModalPrompter.prototype = {
domWin: null,
/*
* Default to not using a tab-modal prompt, unless the caller opts in by
* QIing to nsIWritablePropertyBag and setting the value of this property
* to true.
*/
allowTabModal: false,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt, Ci.nsIAuthPrompt,
- Ci.nsIAuthPrompt2,
- Ci.nsIWritablePropertyBag2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt, Ci.nsIAuthPrompt,
+ Ci.nsIAuthPrompt2,
+ Ci.nsIWritablePropertyBag2]),
/* ---------- internal methods ---------- */
openPrompt(args) {
// Check pref, if false/missing do not ever allow tab-modal prompts.
const prefName = "prompts.tab_modal.enabled";
@@ -877,32 +877,32 @@ ModalPrompter.prototype = {
},
};
function AuthPromptAdapterFactory() {
}
AuthPromptAdapterFactory.prototype = {
classID: Components.ID("{6e134924-6c3a-4d86-81ac-69432dd971dc}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPromptAdapterFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAuthPromptAdapterFactory]),
/* ---------- nsIAuthPromptAdapterFactory ---------- */
createAdapter(oldPrompter) {
return new AuthPromptAdapter(oldPrompter);
}
};
// Takes an nsIAuthPrompt implementation, wraps it with a nsIAuthPrompt2 shell.
function AuthPromptAdapter(oldPrompter) {
this.oldPrompter = oldPrompter;
}
AuthPromptAdapter.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAuthPrompt2]),
oldPrompter: null,
/* ---------- nsIAuthPrompt2 ---------- */
promptAuth(channel, level, authInfo, checkLabel, checkValue) {
let message = PromptUtils.makeAuthMessage(channel, authInfo);
let [username, password] = PromptUtils.getAuthInfo(authInfo);
--- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.js
+++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.js
@@ -22,17 +22,17 @@ function RemoteWebNavigation() {
this.wrappedJSObject = this;
}
RemoteWebNavigation.prototype = {
classDescription: "nsIWebNavigation for remote browsers",
classID: Components.ID("{4b56964e-cdf3-4bb8-830c-0e2dad3f4ebd}"),
contractID: "@mozilla.org/remote-web-navigation;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebNavigation, Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebNavigation]),
swapBrowser(aBrowser) {
this._browser = aBrowser;
},
LOAD_FLAGS_MASK: 65535,
LOAD_FLAGS_NONE: 0,
LOAD_FLAGS_IS_REFRESH: 16,
--- a/toolkit/components/reputationservice/test/unit/test_app_rep.js
+++ b/toolkit/components/reputationservice/test/unit/test_app_rep.js
@@ -309,31 +309,31 @@ add_test(function test_redirect_on_block
listCounts[BLOCK_LIST]++;
listCounts[ALLOW_LIST]++;
listCounts[NO_LIST]++;
let secman = Services.scriptSecurityManager;
let badRedirects = Cc["@mozilla.org/array;1"]
.createInstance(Ci.nsIMutableArray);
let redirect1 = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
principal: secman.createCodebasePrincipal(exampleURI, {}),
};
badRedirects.appendElement(redirect1);
let redirect2 = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
principal: secman.createCodebasePrincipal(blocklistedURI, {}),
};
badRedirects.appendElement(redirect2);
// Add a whitelisted URI that will not be looked up against the
// whitelist (i.e. it will match NO_LIST).
let redirect3 = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
principal: secman.createCodebasePrincipal(whitelistedURI, {}),
};
badRedirects.appendElement(redirect3);
gAppRep.queryReputation({
sourceURI: whitelistedURI,
referrerURI: exampleURI,
redirects: badRedirects,
@@ -387,25 +387,25 @@ add_test(function test_whitelisted_redir
let counts = get_telemetry_counts();
let listCounts = counts.listCounts;
listCounts[NO_LIST] += 3;
let secman = Services.scriptSecurityManager;
let okayRedirects = Cc["@mozilla.org/array;1"]
.createInstance(Ci.nsIMutableArray);
let redirect1 = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
principal: secman.createCodebasePrincipal(exampleURI, {}),
};
okayRedirects.appendElement(redirect1);
// Add a whitelisted URI that will not be looked up against the
// whitelist (i.e. it will match NO_LIST).
let redirect2 = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRedirectHistoryEntry]),
principal: secman.createCodebasePrincipal(whitelistedURI, {}),
};
okayRedirects.appendElement(redirect2);
gAppRep.queryReputation({
sourceURI: exampleURI,
redirects: okayRedirects,
fileSize: 12,
--- a/toolkit/components/satchel/AutoCompletePopup.jsm
+++ b/toolkit/components/satchel/AutoCompletePopup.jsm
@@ -10,17 +10,17 @@ ChromeUtils.import("resource://gre/modul
ChromeUtils.import("resource://gre/modules/Services.jsm");
// AutoCompleteResultView is an abstraction around a list of results
// we got back up from browser-content.js. It implements enough of
// nsIAutoCompleteController and nsIAutoCompleteInput to make the
// richlistbox popup work.
var AutoCompleteResultView = {
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIAutoCompleteController,
Ci.nsIAutoCompleteInput,
]),
// Private variables
results: [],
// nsIAutoCompleteController
--- a/toolkit/components/satchel/FormHistoryStartup.js
+++ b/toolkit/components/satchel/FormHistoryStartup.js
@@ -8,17 +8,17 @@ ChromeUtils.import("resource://gre/modul
ChromeUtils.defineModuleGetter(this, "FormHistory",
"resource://gre/modules/FormHistory.jsm");
function FormHistoryStartup() { }
FormHistoryStartup.prototype = {
classID: Components.ID("{3A0012EB-007F-4BB8-AA81-A07385F77A25}"),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
Ci.nsIFrameMessageListener,
]),
observe(subject, topic, data) {
switch (topic) {
case "nsPref:changed":
--- a/toolkit/components/satchel/formSubmitListener.js
+++ b/toolkit/components/satchel/formSubmitListener.js
@@ -5,17 +5,17 @@
/* eslint-env mozilla/frame-script */
(function() {
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
let satchelFormListener = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIFormSubmitObserver,
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
]),
debug: true,
enabled: true,
--- a/toolkit/components/satchel/nsFormAutoComplete.js
+++ b/toolkit/components/satchel/nsFormAutoComplete.js
@@ -156,17 +156,17 @@ function FormAutoComplete() {
this.init();
}
/**
* Implements the nsIFormAutoComplete interface in the main process.
*/
FormAutoComplete.prototype = {
classID: Components.ID("{c11c21b2-71c9-4f87-a0f8-5e13f50495fd}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFormAutoComplete, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFormAutoComplete, Ci.nsISupportsWeakReference]),
_prefBranch: null,
_debug: true, // mirrors browser.formfill.debug
_enabled: true, // mirrors browser.formfill.enable preference
_agedWeight: 2,
_bucketSize: 1,
_maxTimeGroupings: 25,
_timeGroupingSize: 7 * 24 * 60 * 60 * 1000 * 1000,
@@ -194,17 +194,17 @@ FormAutoComplete.prototype = {
this._maxTimeGroupings = this._prefBranch.getIntPref("maxTimeGroupings");
this._timeGroupingSize = this._prefBranch.getIntPref("timeGroupingSize") * 1000 * 1000;
this._expireDays = this._prefBranch.getIntPref("expire_days");
},
observer: {
_self: null,
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference,
]),
observe(subject, topic, data) {
let self = this._self;
if (topic == "nsPref:changed") {
@@ -547,17 +547,17 @@ function FormAutoCompleteResult(client,
this.client = client;
this.entries = entries;
this.fieldName = fieldName;
this.searchString = searchString;
this.messageManager = messageManager;
}
FormAutoCompleteResult.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteResult, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteResult, Ci.nsISupportsWeakReference]),
// private
client: null,
entries: null,
fieldName: null,
_checkIndexBounds(index) {
if (index < 0 || index >= this.entries.length) {
--- a/toolkit/components/satchel/nsFormAutoCompleteResult.jsm
+++ b/toolkit/components/satchel/nsFormAutoCompleteResult.jsm
@@ -170,10 +170,10 @@ FormAutoCompleteResult.prototype = {
this._formHistResult.removeValueAt(index, true);
}
this._values.splice(index, 1);
this._labels.splice(index, 1);
this._comments.splice(index, 1);
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteResult]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteResult]),
};
--- a/toolkit/components/satchel/nsInputListAutoComplete.js
+++ b/toolkit/components/satchel/nsInputListAutoComplete.js
@@ -5,17 +5,17 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/nsFormAutoCompleteResult.jsm");
function InputListAutoComplete() {}
InputListAutoComplete.prototype = {
classID: Components.ID("{bf1e01d0-953e-11df-981c-0800200c9a66}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIInputListAutoComplete]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIInputListAutoComplete]),
autoCompleteSearch(aUntrimmedSearchString, aField) {
let [values, labels] = this.getListSuggestions(aField);
let searchResult = values.length > 0 ?
Ci.nsIAutoCompleteResult.RESULT_SUCCESS :
Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
let defaultIndex = values.length > 0 ? 0 : -1;
--- a/toolkit/components/satchel/test/unit/test_notify.js
+++ b/toolkit/components/satchel/test/unit/test_notify.js
@@ -5,17 +5,17 @@
*
*/
ChromeUtils.defineModuleGetter(this, "setTimeout", "resource://gre/modules/Timer.jsm");
ChromeUtils.defineModuleGetter(this, "Preferences", "resource://gre/modules/Preferences.jsm");
const TestObserver = {
observed: [],
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
if (subject instanceof Ci.nsISupportsString) {
subject = subject.toString();
}
this.observed.push({subject, topic, data});
},
reset() {
this.observed = [];
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -269,17 +269,17 @@ function loadListener(aChannel, aEngine,
}
loadListener.prototype = {
_callback: null,
_channel: null,
_countRead: 0,
_engine: null,
_stream: null,
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIRequestObserver,
Ci.nsIStreamListener,
Ci.nsIChannelEventSink,
Ci.nsIInterfaceRequestor,
Ci.nsIProgressEventSink
]),
// nsIRequestObserver
@@ -2449,17 +2449,17 @@ Engine.prototype = {
return {
mainDomain: templateUrl.host,
path: templateUrl.filePath.toLowerCase(),
termsParameterName,
};
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISearchEngine]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISearchEngine]),
get wrappedJSObject() {
return this;
},
/**
* Returns a string with the URL to an engine's icon matching both width and
* height. Returns null if icon with specified dimensions is not found.
@@ -2566,17 +2566,17 @@ function Submission(aURI, aPostData = nu
}
Submission.prototype = {
get uri() {
return this._uri;
},
get postData() {
return this._postData;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISearchSubmission])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISearchSubmission])
};
// nsISearchParseSubmissionResult
function ParseSubmissionResult(aEngine, aTerms, aTermsOffset, aTermsLength) {
this._engine = aEngine;
this._terms = aTerms;
this._termsOffset = aTermsOffset;
this._termsLength = aTermsLength;
@@ -2589,17 +2589,17 @@ ParseSubmissionResult.prototype = {
return this._terms;
},
get termsOffset() {
return this._termsOffset;
},
get termsLength() {
return this._termsLength;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISearchParseSubmissionResult]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISearchParseSubmissionResult]),
};
const gEmptyParseSubmissionResult =
Object.freeze(new ParseSubmissionResult(null, "", -1, 0));
function executeSoon(func) {
Services.tm.dispatchToMainThread(func);
}
@@ -4568,17 +4568,17 @@ SearchService.prototype = {
Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC);
Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC);
if (AppConstants.MOZ_BUILD_APP == "mobile/android") {
Services.obs.removeObserver(this, REQ_LOCALES_CHANGED_TOPIC);
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIBrowserSearchService,
Ci.nsIObserver,
Ci.nsITimerCallback
])
};
const SEARCH_UPDATE_LOG_PREFIX = "*** Search update: ";
--- a/toolkit/components/search/nsSearchSuggestions.js
+++ b/toolkit/components/search/nsSearchSuggestions.js
@@ -158,18 +158,18 @@ SuggestAutoComplete.prototype = {
* Ends the search result gathering process. Part of nsIAutoCompleteSearch
* implementation.
*/
stopSearch() {
this._suggestionController.stop();
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteSearch,
- Ci.nsIAutoCompleteObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompleteSearch,
+ Ci.nsIAutoCompleteObserver])
};
/**
* SearchSuggestAutoComplete is a service implementation that handles suggest
* results specific to web searches.
* @constructor
*/
function SearchSuggestAutoComplete() {
--- a/toolkit/components/search/nsSidebar.js
+++ b/toolkit/components/search/nsSidebar.js
@@ -39,13 +39,12 @@ nsSidebar.prototype = {
// This function exists to implement window.external.IsSearchProviderInstalled(),
// for compatibility with other browsers. The function has been deprecated
// and so will not be implemented.
IsSearchProviderInstalled(engineURL) {
return 0;
},
classID: Components.ID("{22117140-9c6e-11d3-aaf1-00805f8a4905}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
- Ci.nsIDOMGlobalPropertyInitializer])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsSidebar]);
--- a/toolkit/components/search/tests/xpcshell/head_search.js
+++ b/toolkit/components/search/tests/xpcshell/head_search.js
@@ -83,18 +83,18 @@ function installAddonEngine(name = "engi
do_get_file("data/install.rdf").copyTo(dir, "install.rdf");
let addonDir = dir.clone();
dir.append("searchplugins");
dir.create(dir.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
do_get_file("data/" + name + ".xml").copyTo(dir, "bug645970.xml");
Services.dirsvc.registerProvider({
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider,
- Ci.nsIDirectoryServiceProvider2]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDirectoryServiceProvider,
+ Ci.nsIDirectoryServiceProvider2]),
getFile(prop, persistant) {
throw Cr.NS_ERROR_FAILURE;
},
getFiles(prop) {
let result = [];
@@ -102,17 +102,17 @@ function installAddonEngine(name = "engi
case XRE_EXTENSIONS_DIR_LIST:
result.push(addonDir);
break;
default:
throw Cr.NS_ERROR_FAILURE;
}
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISimpleEnumerator]),
hasMoreElements: () => result.length > 0,
getNext: () => result.shift()
};
}
});
}
/**
--- a/toolkit/components/search/tests/xpcshell/test_addEngine_callback.js
+++ b/toolkit/components/search/tests/xpcshell/test_addEngine_callback.js
@@ -6,21 +6,21 @@
*/
ChromeUtils.import("resource://testing-common/MockRegistrar.jsm");
"use strict";
// Only need to stub the methods actually called by nsSearchService
var promptService = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
confirmEx() {}
};
var prompt = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPrompt]),
alert() {}
};
// Override the prompt service and nsIPrompt, since the search service currently
// prompts in response to certain installation failures we test here
// XXX this should disappear once bug 863474 is fixed
MockRegistrar.register("@mozilla.org/embedcomp/prompt-service;1", promptService);
MockRegistrar.register("@mozilla.org/prompter;1", prompt);
--- a/toolkit/components/search/tests/xpcshell/test_location_malformed_json.js
+++ b/toolkit/components/search/tests/xpcshell/test_location_malformed_json.js
@@ -1,16 +1,16 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// A console listener so we can listen for a log message from nsSearchService.
function promiseTimezoneMessage() {
return new Promise(resolve => {
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIConsoleListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIConsoleListener]),
observe(msg) {
if (msg.message.startsWith("getIsUS() fell back to a timezone check with the result=")) {
Services.console.unregisterListener(listener);
resolve(msg);
}
}
};
Services.console.registerListener(listener);
--- a/toolkit/components/search/tests/xpcshell/test_location_sync.js
+++ b/toolkit/components/search/tests/xpcshell/test_location_sync.js
@@ -16,17 +16,17 @@ function getIsUSPref() {
return undefined;
}
}
// A console listener so we can listen for a log message from nsSearchService.
function promiseTimezoneMessage() {
return new Promise(resolve => {
let listener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIConsoleListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIConsoleListener]),
observe(msg) {
if (msg.message.startsWith("getIsUS() fell back to a timezone check with the result=")) {
Services.console.unregisterListener(listener);
resolve(msg);
}
}
};
Services.console.registerListener(listener);
--- a/toolkit/components/securityreporter/SecurityReporter.js
+++ b/toolkit/components/securityreporter/SecurityReporter.js
@@ -29,17 +29,17 @@ function getDERString(cert) {
}
function SecurityReporter() { }
SecurityReporter.prototype = {
classDescription: "Security reporter component",
classID: Components.ID("{8a997c9a-bea1-11e5-a1fa-be6aBc8e7f8b}"),
contractID: "@mozilla.org/securityreporter;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISecurityReporter]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISecurityReporter]),
reportTLSError(transportSecurityInfo, hostname, port) {
// don't send if there's no transportSecurityInfo (since the report cannot
// contain anything of interest)
if (!transportSecurityInfo) {
return;
}
// don't send a report if the pref is not enabled
--- a/toolkit/components/telemetry/TelemetryController.jsm
+++ b/toolkit/components/telemetry/TelemetryController.jsm
@@ -865,17 +865,17 @@ var Impl = {
this.submitExternalPing(PING_TYPE_DELETION, {}, { addClientId: true });
}
})();
this._shutdownBarrier.client.addBlocker(
"TelemetryController: removing pending pings after data upload was disabled", p);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference]),
_attachObservers() {
if (IS_UNIFIED_TELEMETRY) {
// Watch the FHR upload setting to trigger deletion pings.
Services.prefs.addObserver(TelemetryUtils.Preferences.FhrUploadEnabled, this, true);
}
},
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -1097,17 +1097,17 @@ EnvironmentCache.prototype = {
} else if (prefType == Ci.nsIPrefBranch.PREF_INT) {
return Services.prefs.getIntPref(pref);
} else if (prefType == Ci.nsIPrefBranch.PREF_INVALID) {
return null;
}
throw new Error(`Unexpected preference type ("${prefType}") for "${pref}".`);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference]),
/**
* Start watching the preferences.
*/
_startWatchingPrefs() {
this._log.trace("_startWatchingPrefs - " + this._watchedPrefs);
for (let [pref, options] of this._watchedPrefs) {
--- a/toolkit/components/telemetry/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/TelemetrySend.jsm
@@ -648,17 +648,17 @@ var TelemetrySendImpl = {
this._annotateCrashReport();
// Install the observer to detect OS shutdown early enough, so
// that we catch this before the delayed setup happens.
Services.obs.addObserver(this, TOPIC_QUIT_APPLICATION_FORCED);
Services.obs.addObserver(this, TOPIC_QUIT_APPLICATION_GRANTED);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference]),
async setup(testing) {
this._log.trace("setup");
this._testMode = testing;
Services.obs.addObserver(this, TOPIC_IDLE_DAILY);
Services.obs.addObserver(this, TOPIC_PROFILE_CHANGE_NET_TEARDOWN);
--- a/toolkit/components/telemetry/TelemetryStartup.js
+++ b/toolkit/components/telemetry/TelemetryStartup.js
@@ -15,17 +15,17 @@ ChromeUtils.defineModuleGetter(this, "Te
/**
* TelemetryStartup is needed to forward the "profile-after-change" notification
* to TelemetryController.jsm.
*/
function TelemetryStartup() {
}
TelemetryStartup.prototype.classID = Components.ID("{117b219f-92fe-4bd2-a21b-95a342a9d474}");
-TelemetryStartup.prototype.QueryInterface = XPCOMUtils.generateQI([Ci.nsIObserver]);
+TelemetryStartup.prototype.QueryInterface = ChromeUtils.generateQI([Ci.nsIObserver]);
TelemetryStartup.prototype.observe = function(aSubject, aTopic, aData) {
if (aTopic == "profile-after-change") {
// In the content process, this is done in ContentProcessSingleton.js.
TelemetryController.observe(null, aTopic, null);
}
if (aTopic == "profile-after-change") {
annotateEnvironment();
TelemetryEnvironment.registerChangeListener("CrashAnnotator", annotateEnvironment);
--- a/toolkit/components/telemetry/tests/unit/test_TelemetrySend.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetrySend.js
@@ -615,17 +615,17 @@ add_task(async function test_pref_observ
}
Services.prefs.setBoolPref(TelemetryUtils.Preferences.FhrUploadEnabled, true);
function waitAnnotateCrashReport(expectedValue, trigger) {
return new Promise(function(resolve, reject) {
let keys = new Set(["TelemetryClientId", "TelemetryServerURL"]);
let crs = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICrashReporter]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICrashReporter]),
annotateCrashReport(key, value) {
if (!keys.delete(key)) {
MockRegistrar.unregister(gMockCrs);
reject(Error(`Crash report annotation with unexpected key: "${key}".`));
}
if (expectedValue && value == "") {
MockRegistrar.unregister(gMockCrs);
--- a/toolkit/components/terminator/nsTerminatorTelemetry.js
+++ b/toolkit/components/terminator/nsTerminatorTelemetry.js
@@ -31,17 +31,17 @@ var HISTOGRAMS = {
nsTerminatorTelemetry.prototype = {
classID: Components.ID("{3f78ada1-cba2-442a-82dd-d5fb300ddea7}"),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(nsTerminatorTelemetry),
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
// nsIObserver
observe: function DS_observe(aSubject, aTopic, aData) {
(async function() {
//
// This data is hardly critical, reading it can wait for a few seconds.
//
--- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
+++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
@@ -187,17 +187,17 @@ const BackgroundPageThumbs = {
this._startedParentWinInit = true;
// Create a windowless browser and load our hosting
// (privileged) document in it.
let wlBrowser = Services.appShell.createWindowlessBrowser(true);
wlBrowser.QueryInterface(Ci.nsIInterfaceRequestor);
let webProgress = wlBrowser.getInterface(Ci.nsIWebProgress);
this._listener = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, Ci.nsIWebProgressListener2,
Ci.nsISupportsWeakReference]),
};
this._listener.onStateChange = (wbp, request, stateFlags, status) => {
if (!request) {
return;
}
if (stateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
--- a/toolkit/components/thumbnails/PageThumbs.jsm
+++ b/toolkit/components/thumbnails/PageThumbs.jsm
@@ -827,11 +827,11 @@ var PageThumbsHistoryObserver = {
onTitleChanged() {},
onBeginUpdateBatch() {},
onEndUpdateBatch() {},
onVisits() {},
onPageChanged() {},
onDeleteVisits() {},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver,
+ Ci.nsISupportsWeakReference])
};
--- a/toolkit/components/thumbnails/PageThumbsStorageService.js
+++ b/toolkit/components/thumbnails/PageThumbsStorageService.js
@@ -12,17 +12,17 @@ XPCOMUtils.defineLazyGetter(this, "gUnic
.createInstance(Ci.nsIScriptableUnicodeConverter);
converter.charset = "utf8";
return converter;
});
function PageThumbsStorageService() {}
PageThumbsStorageService.prototype = {
classID: Components.ID("{97943eec-0e48-49ef-b7b7-cf4aa0109bb6}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPageThumbsStorageService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPageThumbsStorageService]),
_xpcom_categories: [{
service: true
}],
// The path for the storage
_path: null,
get path() {
if (!this._path) {
this._path = OS.Path.join(OS.Constants.Path.localProfileDir, THUMBNAIL_DIRECTORY);
--- a/toolkit/components/thumbnails/content/backgroundPageThumbsContent.js
+++ b/toolkit/components/thumbnails/content/backgroundPageThumbsContent.js
@@ -226,16 +226,16 @@ const backgroundPageThumbsContent = {
if (!docShell) {
return;
}
this._webNav.loadURI("about:blank",
Ci.nsIWebNavigation.LOAD_FLAGS_STOP_CONTENT,
null, null, null);
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
Ci.nsIObserver,
]),
};
backgroundPageThumbsContent.init();
--- a/toolkit/components/timermanager/nsUpdateTimerManager.js
+++ b/toolkit/components/timermanager/nsUpdateTimerManager.js
@@ -323,14 +323,14 @@ TimerManager.prototype = {
delete this._timers[id];
} else {
LOG("TimerManager:unregisterTimer - Ignoring unregistration request for " +
"unknown id: " + id);
}
},
classID: Components.ID("{B322A5C0-A419-484E-96BA-D7182163899F}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdateTimerManager,
- Ci.nsITimerCallback,
- Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateTimerManager,
+ Ci.nsITimerCallback,
+ Ci.nsIObserver])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TimerManager]);
--- a/toolkit/components/timermanager/tests/unit/consumerNotifications.js
+++ b/toolkit/components/timermanager/tests/unit/consumerNotifications.js
@@ -136,17 +136,17 @@ XPCOMUtils.defineLazyGetter(this, "gComp
});
const gTest0TimerCallback = {
notify: function T0CB_notify(aTimer) {
// This can happen when another notification fails and this timer having
// time to fire so check other timers are successful.
do_throw("gTest0TimerCallback notify method should not have been called");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest0Factory = {
createInstance: function T0F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest0TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
@@ -154,17 +154,17 @@ const gTest0Factory = {
};
const gTest1TimerCallback = {
notify: function T1CB_notify(aTimer) {
// This can happen when another notification fails and this timer having
// time to fire so check other timers are successful.
do_throw("gTest1TimerCallback notify method should not have been called");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimer])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimer])
};
const gTest1Factory = {
createInstance: function T1F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest1TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
@@ -172,30 +172,30 @@ const gTest1Factory = {
};
const gTest2TimerCallback = {
notify: function T2CB_notify(aTimer) {
// This can happen when another notification fails and this timer having
// time to fire so check other timers are successful.
do_throw("gTest2TimerCallback notify method should not have been called");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest2Factory = {
createInstance: function T2F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest2TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
}
};
const gTest3TimerCallback = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest3Factory = {
createInstance: function T3F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest3TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
@@ -203,17 +203,17 @@ const gTest3Factory = {
};
const gTest4TimerCallback = {
notify: function T4CB_notify(aTimer) {
gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[4].desc, true);
TESTS[4].notified = true;
finished_test0thru7();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest4Factory = {
createInstance: function T4F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest4TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
@@ -221,17 +221,17 @@ const gTest4Factory = {
};
const gTest5TimerCallback = {
notify: function T5CB_notify(aTimer) {
gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[5].desc, true);
TESTS[5].notified = true;
finished_test0thru7();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest5Factory = {
createInstance: function T5F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest5TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
@@ -239,17 +239,17 @@ const gTest5Factory = {
};
const gTest6TimerCallback = {
notify: function T6CB_notify(aTimer) {
gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[6].desc, true);
TESTS[6].notified = true;
finished_test0thru7();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest6Factory = {
createInstance: function T6F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest6TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
@@ -257,17 +257,17 @@ const gTest6Factory = {
};
const gTest7TimerCallback = {
notify: function T7CB_notify(aTimer) {
gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[7].desc, true);
TESTS[7].notified = true;
finished_test0thru7();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest7Factory = {
createInstance: function T7F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest7TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
@@ -277,17 +277,17 @@ const gTest7Factory = {
const gTest8TimerCallback = {
notify: function T8CB_notify(aTimer) {
TESTS[8].notified = true;
TESTS[8].notifyTime = Date.now();
executeSoon(function() {
check_test8thru10(gTest8TimerCallback);
});
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest8Factory = {
createInstance: function T8F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest8TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
@@ -297,26 +297,26 @@ const gTest8Factory = {
const gTest9TimerCallback = {
notify: function T9CB_notify(aTimer) {
TESTS[9].notified = true;
TESTS[9].notifyTime = Date.now();
executeSoon(function() {
check_test8thru10(gTest9TimerCallback);
});
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest10TimerCallback = {
notify: function T9CB_notify(aTimer) {
// The timer should have been unregistered before this could
// be called.
do_throw("gTest10TimerCallback notify method should not have been called");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
const gTest9Factory = {
createInstance: function T9F_createInstance(aOuter, aIID) {
if (aOuter == null) {
return gTest9TimerCallback.QueryInterface(aIID);
}
throw Cr.NS_ERROR_NO_AGGREGATION;
--- a/toolkit/components/tooltiptext/TooltipTextProvider.js
+++ b/toolkit/components/tooltiptext/TooltipTextProvider.js
@@ -140,13 +140,13 @@ TooltipTextProvider.prototype = {
return true;
}
return false;
});
},
classID: Components.ID("{f376627f-0bbc-47b8-887e-fc92574cc91f}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITooltipTextProvider]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITooltipTextProvider]),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TooltipTextProvider]);
--- a/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js
+++ b/toolkit/components/url-classifier/nsUrlClassifierHashCompleter.js
@@ -149,17 +149,17 @@ function httpStatusToBucket(httpStatus)
function FullHashMatch(table, hash, duration) {
this.tableName = table;
this.fullHash = hash;
this.cacheDuration = duration;
}
FullHashMatch.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFullHashMatch]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFullHashMatch]),
tableName: null,
fullHash: null,
cacheDuration: null,
};
function HashCompleter() {
// The current HashCompleterRequest in flight. Once it is started, it is set
@@ -184,22 +184,17 @@ function HashCompleter() {
Services.obs.addObserver(this, "quit-application");
Services.prefs.addObserver(PREF_DEBUG_ENABLED, this);
loggingEnabled = Services.prefs.getBoolPref(PREF_DEBUG_ENABLED);
}
HashCompleter.prototype = {
classID: Components.ID("{9111de73-9322-4bfc-8b65-2b727f3e6ec8}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUrlClassifierHashCompleter,
- Ci.nsIRunnable,
- Ci.nsIObserver,
- Ci.nsISupportsWeakReference,
- Ci.nsITimerCallback,
- Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUrlClassifierHashCompleter, Ci.nsIRunnable, Ci.nsIObserver, Ci.nsISupportsWeakReference, Ci.nsITimerCallback]),
// This is mainly how the HashCompleter interacts with other components.
// Even though it only takes one partial hash and callback, subsequent
// calls are made into the same HTTP request by using a thread dispatch.
complete: function HC_complete(aPartialHash, aGethashUrl, aTableName, aCallback) {
if (!aGethashUrl) {
throw Cr.NS_ERROR_NOT_INITIALIZED;
}
@@ -338,20 +333,17 @@ function HashCompleterRequest(aCompleter
// Multiple partial hashes can be associated with the same tables
// so we use a map here.
this.tableNames = new Map();
this.telemetryProvider = "";
this.telemetryClockStart = 0;
}
HashCompleterRequest.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRequestObserver,
- Ci.nsIStreamListener,
- Ci.nsIObserver,
- Ci.nsISupports]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRequestObserver, Ci.nsIStreamListener, Ci.nsIObserver]),
// This is called by the HashCompleter to add a hash and callback to the
// HashCompleterRequest. It must be called before calling |begin|.
add: function HCR_add(aPartialHash, aCallback, aTableName) {
this._requests.push({
partialHash: aPartialHash,
callback: aCallback,
tableName: aTableName,
--- a/toolkit/components/url-classifier/nsUrlClassifierLib.js
+++ b/toolkit/components/url-classifier/nsUrlClassifierLib.js
@@ -204,11 +204,11 @@ function RequestBackoffV4(maxRequests, r
// Expose this whole component.
var lib = this;
function UrlClassifierLib() {
this.wrappedJSObject = lib;
}
UrlClassifierLib.prototype.classID = Components.ID("{26a4a019-2827-4a89-a85c-5931a678823a}");
-UrlClassifierLib.prototype.QueryInterface = XPCOMUtils.generateQI([]);
+UrlClassifierLib.prototype.QueryInterface = ChromeUtils.generateQI([]);
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([UrlClassifierLib]);
--- a/toolkit/components/url-classifier/tests/mochitest/test_threathit_report.html
+++ b/toolkit/components/url-classifier/tests/mochitest/test_threathit_report.html
@@ -204,17 +204,17 @@ function testOnWindow(aTestData) {
let utils = Cc["@mozilla.org/url-classifier/utils;1"].
getService(Ci.nsIUrlClassifierUtils);
expected = aTestData.reportUrl + "&$req=" +
utils.makeThreatHitReport(aRequest,
aTestData.list,
btoa(hash(aTestData.url)));
},
- QueryInterface: XPCOMUtils.generateQI(["nsISupportsWeakReference"])
+ QueryInterface: ChromeUtils.generateQI(["nsISupportsWeakReference"])
};
wp.addProgressListener(progressListener, wp.NOTIFY_SECURITY);
await BrowserTestUtils.loadURI(browser, aTestData.url);
await BrowserTestUtils.waitForContentEvent(browser, "DOMContentLoaded");
checkResults(aTestData, expected);
win.close();
resolve();
--- a/toolkit/components/urlformatter/nsURLFormatter.js
+++ b/toolkit/components/urlformatter/nsURLFormatter.js
@@ -62,17 +62,17 @@ function nsURLFormatterService() {
let version = defaults.getCharPref(PREF_APP_DISTRIBUTION_VERSION, "default");
return {id, version};
});
}
nsURLFormatterService.prototype = {
classID: Components.ID("{e6156350-2be8-11db-a98b-0800200c9a66}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIURLFormatter]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIURLFormatter]),
_defaults: {
LOCALE: () => Services.locale.getAppLocaleAsLangTag(),
REGION() {
try {
// When the geoip lookup failed to identify the region, we fallback to
// the 'ZZ' region code to mean 'unknown'.
return Services.prefs.getCharPref("browser.search.region") || "ZZ";
--- a/toolkit/components/utils/simpleServices.js
+++ b/toolkit/components/utils/simpleServices.js
@@ -28,17 +28,17 @@ ChromeUtils.defineModuleGetter(this, "Se
* See SubstituteChannel in netwerk/protocol/res/ExtensionProtocolHandler.cpp
* for usage.
*/
function AddonLocalizationConverter() {
}
AddonLocalizationConverter.prototype = {
classID: Components.ID("{ded150e3-c92e-4077-a396-0dba9953e39f}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamConverter]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIStreamConverter]),
FROM_TYPE: "application/vnd.mozilla.webext.unlocalized",
TO_TYPE: "text/css",
checkTypes(aFromType, aToType) {
if (aFromType != this.FROM_TYPE) {
throw Components.Exception("Invalid aFromType value", Cr.NS_ERROR_INVALID_ARG,
Components.stack.caller.caller);
--- a/toolkit/components/xulstore/XULStore.js
+++ b/toolkit/components/xulstore/XULStore.js
@@ -24,18 +24,18 @@ function XULStore() {
}
XULStore.prototype = {
classID: XULSTORE_CID,
classInfo: XPCOMUtils.generateCI({classID: XULSTORE_CID,
contractID: XULSTORE_CONTRACTID,
classDescription: "XULStore",
interfaces: [Ci.nsIXULStore]}),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsIXULStore,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsIXULStore,
+ Ci.nsISupportsWeakReference]),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(XULStore),
/* ---------- private members ---------- */
/*
* The format of _data is _data[docuri][elementid][attribute]. For example:
* {
* "chrome://blah/foo.xul" : {
@@ -267,17 +267,17 @@ XULStore.prototype = {
}
};
function nsStringEnumerator(items) {
this._items = items;
}
nsStringEnumerator.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIStringEnumerator]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIStringEnumerator]),
_nextIndex: 0,
hasMore() {
return this._nextIndex < this._items.length;
},
getNext() {
if (!this.hasMore())
throw Cr.NS_ERROR_NOT_AVAILABLE;
return this._items[this._nextIndex++];
--- a/toolkit/content/aboutServiceWorkers.js
+++ b/toolkit/content/aboutServiceWorkers.js
@@ -158,17 +158,17 @@ function display(info, pushService) {
div.classList.add("active");
}
},
unregisterFailed() {
alert(bundle.GetStringFromName("unregisterError"));
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIServiceWorkerUnregisterCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIServiceWorkerUnregisterCallback])
};
loadingMessage.classList.remove("inactive");
gSWM.propagateUnregister(info.principal, cb, info.scope);
};
let sep = document.createElement("hr");
div.appendChild(sep);
--- a/toolkit/content/browser-content.js
+++ b/toolkit/content/browser-content.js
@@ -492,18 +492,18 @@ XPCOMUtils.defineLazyGetter(this, "conso
var Printing = {
// Bug 1088061: nsPrintJob's DoCommonPrint currently expects the
// progress listener passed to it to QI to an nsIPrintingPromptService
// in order to know that a printing progress dialog has been shown. That's
// really all the interface is used for, hence the fact that I don't actually
// implement the interface here. Bug 1088061 has been filed to remove
// this hackery.
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsIPrintingPromptService]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsIPrintingPromptService]),
MESSAGES: [
"Printing:Preview:Enter",
"Printing:Preview:Exit",
"Printing:Preview:Navigate",
"Printing:Preview:ParseDocument",
"Printing:Print",
],
@@ -647,17 +647,17 @@ var Printing = {
sendAsyncMessage("Printing:Preview:ReaderModeReady");
}, 100);
} else {
sendAsyncMessage("Printing:Preview:ReaderModeReady");
}
}
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsISupportsWeakReference,
Ci.nsIObserver,
]),
};
// Here we QI the docShell into a nsIWebProgress passing our web progress listener in.
let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
@@ -1173,17 +1173,17 @@ addMessageListener("WebChannelMessageToC
Cu.reportError("WebChannel message failed. Principal mismatch.");
}
} else {
Cu.reportError("WebChannel message failed. No message data.");
}
});
var AudioPlaybackListener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
init() {
Services.obs.addObserver(this, "audio-playback");
addMessageListener("AudioPlayback", this);
addEventListener("unload", () => {
AudioPlaybackListener.uninit();
});
@@ -1634,17 +1634,17 @@ addEventListener("MozApplicationManifest
characterSet: doc.characterSet,
manifest: doc.documentElement.getAttribute("manifest"),
principal: doc.nodePrincipal,
};
sendAsyncMessage("MozApplicationManifest", info);
}, false);
let AutoCompletePopup = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompletePopup]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIAutoCompletePopup]),
_connected: false,
MESSAGES: [
"FormAutoComplete:HandleEnter",
"FormAutoComplete:PopupClosed",
"FormAutoComplete:PopupOpened",
"FormAutoComplete:RequestFocus",
--- a/toolkit/content/preferencesBindings.js
+++ b/toolkit/content/preferencesBindings.js
@@ -114,17 +114,17 @@ const Preferences = window.Preferences =
}
}
},
onUnload() {
Services.prefs.removeObserver("", this);
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsITimerCallback,
Ci.nsIObserver,
]),
_deferredValueUpdateElements: new Set(),
writePreferences(aFlushToDisk) {
// Write all values to preferences.
--- a/toolkit/content/tests/browser/browser_isSynthetic.js
+++ b/toolkit/content/tests/browser/browser_isSynthetic.js
@@ -10,18 +10,18 @@ LocationChangeListener.prototype = {
destroy() {
this.browser.removeProgressListener(this);
},
onLocationChange(webProgress, request, location, flags) {
this.wasSynthetic = this.browser.isSyntheticDocument;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference])
};
const FILES = gTestPath.replace("browser_isSynthetic.js", "")
.replace("chrome://mochitests/content/", "http://example.com/");
function waitForPageShow(browser) {
return ContentTask.spawn(browser, null, async function() {
ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
--- a/toolkit/content/tests/browser/common/mockTransfer.js
+++ b/toolkit/content/tests/browser/common/mockTransfer.js
@@ -11,17 +11,17 @@ var mockTransferCallback;
* when the download is completed, reporting true for success or false for
* failure as the first argument of the testRunner.continueTest function.
*/
function MockTransfer() {
this._downloadIsSuccessful = true;
}
MockTransfer.prototype = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsIWebProgressListener2,
Ci.nsITransfer,
]),
/* nsIWebProgressListener */
onStateChange: function MTFC_onStateChange(aWebProgress, aRequest,
aStateFlags, aStatus) {
--- a/toolkit/content/tests/chrome/test_autocomplete_delayOnPaste.xul
+++ b/toolkit/content/tests/chrome/test_autocomplete_delayOnPaste.xul
@@ -47,17 +47,17 @@ autoCompleteSimpleResult.prototype = {
getLabelAt: function() { return null; },
removeValueAt: function() {}
};
// A basic autocomplete implementation that returns one result.
let autoCompleteSimple = {
classID: Components.ID("0a2afbdb-f30e-47d1-9cb1-0cd160240aca"),
contractID: "@mozilla.org/autocomplete/search;1?name=simple",
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIFactory,
Ci.nsIAutoCompleteSearch
]),
createInstance: function (outer, iid) {
return this.QueryInterface(iid);
},
registerFactory: function () {
--- a/toolkit/content/tests/chrome/test_autocomplete_placehold_last_complete.xul
+++ b/toolkit/content/tests/chrome/test_autocomplete_placehold_last_complete.xul
@@ -56,17 +56,17 @@ var searchCounter = 0;
// A basic autocomplete implementation that returns one result.
let autoCompleteSimple = {
classID: Components.ID("0a2afbdb-f30e-47d1-9cb1-0cd160240aca"),
contractID: "@mozilla.org/autocomplete/search;1?name=simple",
searchAsync: false,
pendingSearch: null,
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIFactory,
Ci.nsIAutoCompleteSearch
]),
createInstance: function (outer, iid) {
return this.QueryInterface(iid);
},
registerFactory: function () {
--- a/toolkit/content/tests/widgets/test_popupreflows.xul
+++ b/toolkit/content/tests/widgets/test_popupreflows.xul
@@ -33,18 +33,18 @@ let observer = {
this.reflows.push(new Error().stack);
},
reflowInterruptible: function (start, end) {
// We're not interested in interruptible reflows. Why, you ask? Because
// we've simply cargo-culted this test from browser_tabopen_reflows.js!
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIReflowObserver,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIReflowObserver,
+ Ci.nsISupportsWeakReference])
};
// A test utility that counts the reflows caused by a test function. If the
// count of reflows isn't what is expected, it causes a test failure and logs
// the stack trace of all seen reflows.
function countReflows(testfn, expected) {
return new Promise(resolve => {
observer.reflows = [];
--- a/toolkit/forgetaboutsite/ServiceWorkerCleanUp.jsm
+++ b/toolkit/forgetaboutsite/ServiceWorkerCleanUp.jsm
@@ -12,17 +12,17 @@ XPCOMUtils.defineLazyServiceGetter(this,
this.EXPORTED_SYMBOLS = ["ServiceWorkerCleanUp"];
function unregisterServiceWorker(aSW) {
return new Promise(resolve => {
let unregisterCallback = {
unregisterSucceeded: resolve,
unregisterFailed: resolve, // We don't care about failures.
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIServiceWorkerUnregisterCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIServiceWorkerUnregisterCallback])
};
serviceWorkerManager.propagateUnregister(aSW.principal, unregisterCallback, aSW.scope);
});
}
this.ServiceWorkerCleanUp = {
removeFromHost(aHost) {
let promises = [];
--- a/toolkit/modules/Finder.jsm
+++ b/toolkit/modules/Finder.jsm
@@ -593,18 +593,18 @@ Finder.prototype = {
return;
// Avoid leaking if we change the page.
this._lastFindResult = this._previousLink = this._currentFoundRange = null;
this.highlighter.onLocationChange();
this.iterator.reset();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference])
};
function GetClipboardSearchString(aLoadContext) {
let searchString = "";
if (!Clipboard.supportsFindClipboard())
return searchString;
try {
--- a/toolkit/modules/HiddenFrame.jsm
+++ b/toolkit/modules/HiddenFrame.jsm
@@ -83,17 +83,17 @@ HiddenFrame.prototype = {
_create() {
ensureCleanupRegistered();
this._browser = Services.appShell.createWindowlessBrowser(true);
this._browser.QueryInterface(Ci.nsIInterfaceRequestor);
gAllHiddenFrames.add(this);
this._webProgress = this._browser.getInterface(Ci.nsIWebProgress);
this._listener = {
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener, Ci.nsIWebProgressListener2,
Ci.nsISupportsWeakReference]),
};
this._listener.onStateChange = (wbp, request, stateFlags, status) => {
if (!request) {
return;
}
if (stateFlags & Ci.nsIWebProgressListener.STATE_STOP) {
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/toolkit/modules/NewTabUtils.jsm
@@ -283,18 +283,18 @@ var AllPages = {
* no-op after the first invokation.
*/
_addObserver: function AllPages_addObserver() {
Services.prefs.addObserver(PREF_NEWTAB_ENABLED, this, true);
Services.obs.addObserver(this, "page-thumbnail:create", true);
this._addObserver = function() {};
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference])
};
/**
* Singleton that keeps track of all pinned links and their positions in the
* grid.
*/
var PinnedLinks = {
/**
@@ -725,18 +725,18 @@ var PlacesProvider = {
obs[aMethodName](this, aArg);
} catch (err) {
Cu.reportError(err);
}
}
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsINavHistoryObserver,
+ Ci.nsISupportsWeakReference]),
};
/**
* Queries history to retrieve the most frecent sites. Emits events when the
* history changes.
*/
var ActivityStreamProvider = {
/**
@@ -1928,18 +1928,18 @@ var Links = {
* Adds a sanitization observer and turns itself into a no-op after the first
* invokation.
*/
_addObserver: function Links_addObserver() {
Services.obs.addObserver(this, "browser:purge-session-history", true);
this._addObserver = function() {};
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference])
};
Links.compareLinks = Links.compareLinks.bind(Links);
/**
* Singleton used to collect telemetry data.
*
*/
--- a/toolkit/modules/Preferences.jsm
+++ b/toolkit/modules/Preferences.jsm
@@ -386,17 +386,17 @@ var observers = [];
function PrefObserver(prefName, callback, thisObject) {
this.prefName = prefName;
this.callback = callback;
this.thisObject = thisObject;
}
PrefObserver.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
// The pref service only observes whole branches, but we only observe
// individual preferences, so we check here that the pref that changed
// is the exact one we're observing (and not some sub-pref on the branch).
if (data != this.prefName)
return;
--- a/toolkit/modules/RemoteController.js
+++ b/toolkit/modules/RemoteController.js
@@ -9,18 +9,18 @@ function RemoteController(browser) {
this._browser = browser;
// A map of commands that have had their enabled/disabled state assigned. The
// value of each key will be true if enabled, and false if disabled.
this._supportedCommands = { };
}
RemoteController.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIController,
- Ci.nsICommandController]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIController,
+ Ci.nsICommandController]),
isCommandEnabled(aCommand) {
return this._supportedCommands[aCommand] || false;
},
supportsCommand(aCommand) {
return aCommand in this._supportedCommands;
},
--- a/toolkit/modules/RemoteSecurityUI.jsm
+++ b/toolkit/modules/RemoteSecurityUI.jsm
@@ -8,17 +8,17 @@ var EXPORTED_SYMBOLS = ["RemoteSecurityU
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function RemoteSecurityUI() {
this._SSLStatus = null;
this._state = 0;
}
RemoteSecurityUI.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISSLStatusProvider, Ci.nsISecureBrowserUI]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISSLStatusProvider, Ci.nsISecureBrowserUI]),
// nsISSLStatusProvider
get SSLStatus() { return this._SSLStatus; },
// nsISecureBrowserUI
get state() { return this._state; },
get tooltipText() { return ""; },
--- a/toolkit/modules/RemoteWebProgress.jsm
+++ b/toolkit/modules/RemoteWebProgress.jsm
@@ -13,17 +13,17 @@ function RemoteWebProgressRequest(spec,
this._uri = Services.io.newURI(spec);
this._originalURI = Services.io.newURI(originalSpec);
this._requestCPOW = requestCPOW;
this._matchedList = matchedList;
}
RemoteWebProgressRequest.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel, Ci.nsIClassifiedChannel]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannel, Ci.nsIClassifiedChannel]),
get URI() { return this._uri.clone(); },
get originalURI() { return this._originalURI.clone(); },
get matchedList() { return this._matchedList; }
};
function RemoteWebProgress(aManager, aIsTopLevel) {
this.wrappedJSObject = this;
--- a/toolkit/modules/Timer.jsm
+++ b/toolkit/modules/Timer.jsm
@@ -14,17 +14,17 @@ var EXPORTED_SYMBOLS = ["setTimeout", "s
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
// This gives us >=2^30 unique timer IDs, enough for 1 per ms for 12.4 days.
var gNextId = 1; // setTimeout and setInterval must return a positive integer
var gTimerTable = new Map(); // int -> nsITimer
// Don't generate this for every timer.
-var setTimeout_timerCallbackQI = XPCOMUtils.generateQI([Ci.nsITimerCallback, Ci.nsINamed]);
+var setTimeout_timerCallbackQI = ChromeUtils.generateQI([Ci.nsITimerCallback, Ci.nsINamed]);
function _setTimeoutOrIsInterval(aCallback, aMilliseconds, aIsInterval,
aTarget, aArgs) {
if (typeof aCallback !== "function") {
throw new Error(`callback is not a function in ${aIsInterval ? "setInterval" : "setTimeout"}`);
}
let id = gNextId++;
let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
--- a/toolkit/modules/addons/WebNavigation.jsm
+++ b/toolkit/modules/addons/WebNavigation.jsm
@@ -90,17 +90,17 @@ var Manager = {
this.uninit();
}
},
/**
* Support nsIObserver interface to observe the urlbar autocomplete events used
* to keep track of the urlbar user interaction.
*/
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
/**
* Observe autocomplete-did-enter-text (to track the user interaction with the awesomebar)
* and webNavigation-createdNavigationTarget (to fire the onCreatedNavigationTarget
* related to windows or tabs opened from the main process) topics.
*
* @param {nsIAutoCompleteInput|Object} subject
* @param {string} topic
--- a/toolkit/modules/addons/WebNavigationContent.js
+++ b/toolkit/modules/addons/WebNavigationContent.js
@@ -29,17 +29,17 @@ function loadListener(event) {
}
addEventListener("DOMContentLoaded", loadListener);
addMessageListener("Extension:DisableWebNavigation", () => {
removeEventListener("DOMContentLoaded", loadListener);
});
var CreatedNavigationTargetListener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
init() {
Services.obs.addObserver(this, "webNavigation-createdNavigationTarget-from-js");
},
uninit() {
Services.obs.removeObserver(this, "webNavigation-createdNavigationTarget-from-js");
},
@@ -79,19 +79,19 @@ var CreatedNavigationTargetListener = {
sourceFrameId,
createdOuterWindowId,
isSourceTab,
});
},
};
var FormSubmitListener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsIFormSubmitObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsIFormSubmitObserver,
+ Ci.nsISupportsWeakReference]),
init() {
this.formSubmitWindows = new WeakSet();
Services.obs.addObserver(FormSubmitListener, "earlyformsubmit");
},
uninit() {
Services.obs.removeObserver(FormSubmitListener, "earlyformsubmit");
this.formSubmitWindows = new WeakSet();
@@ -301,17 +301,17 @@ var WebProgressListener = {
if (this.refreshAttemptedDOMWindows.has(DOMWindow)) {
this.refreshAttemptedDOMWindows.delete(DOMWindow);
frameTransitionData.client_redirect = true;
}
return frameTransitionData;
},
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsIWebProgressListener,
Ci.nsIWebProgressListener2,
Ci.nsISupportsWeakReference,
]),
};
var disabled = false;
WebProgressListener.init();
--- a/toolkit/modules/addons/WebRequest.jsm
+++ b/toolkit/modules/addons/WebRequest.jsm
@@ -318,18 +318,18 @@ var ContentPolicyManager = {
};
ContentPolicyManager.init();
var ChannelEventSink = {
_classDescription: "WebRequest channel event sink",
_classID: Components.ID("115062f8-92f1-11e5-8b7f-080027b0f7ec"),
_contractID: "@mozilla.org/webrequest/channel-event-sink;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannelEventSink,
- Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIChannelEventSink,
+ Ci.nsIFactory]),
init() {
Components.manager.QueryInterface(Ci.nsIComponentRegistrar)
.registerFactory(this._classID, this._classDescription, this._contractID, this);
},
register() {
let catMan = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
@@ -480,17 +480,17 @@ class AuthRequestor {
wrapper.authPromptForward = null;
wrapper.authPromptCallback = null;
}
};
this.httpObserver.runChannelListener(wrapper, "authRequired", data);
return {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable]),
cancel() {
try {
callback.onAuthCancelled(context, false);
} catch (e) {
Cu.reportError(`webRequest onAuthCancelled failure ${e}`);
}
wrapper.authPromptForward = null;
wrapper.authPromptCallback = null;
--- a/toolkit/modules/addons/WebRequestContent.js
+++ b/toolkit/modules/addons/WebRequestContent.js
@@ -17,19 +17,19 @@ ChromeUtils.defineModuleGetter(this, "We
// requests, treat them the same as http in ContentPolicy.
const IS_HTTP = /^(?:http|ws)s?:/;
var ContentPolicy = {
_classDescription: "WebRequest content policy",
_classID: Components.ID("938e5d24-9ccc-4b55-883e-c252a41f7ce9"),
_contractID: "@mozilla.org/webrequest/policy;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy,
- Ci.nsIFactory,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPolicy,
+ Ci.nsIFactory,
+ Ci.nsISupportsWeakReference]),
init() {
let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
registrar.registerFactory(this._classID, this._classDescription, this._contractID, this);
this.contentPolicies = new Map();
Services.cpmm.addMessageListener("WebRequest:AddContentPolicy", this);
Services.cpmm.addMessageListener("WebRequest:RemoveContentPolicy", this);
--- a/toolkit/modules/tests/modules/MockDocument.jsm
+++ b/toolkit/modules/tests/modules/MockDocument.jsm
@@ -51,17 +51,17 @@ const MockDocument = {
Object.defineProperty(aElement, "ownerDocument", {
value: document,
});
},
mockOwnerGlobalProperty(aElement) {
Object.defineProperty(aElement, "ownerGlobal", {
value: {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIInterfaceRequestor]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIInterfaceRequestor]),
getInterface: () => ({
addManuallyManagedState() {},
removeManuallyManagedState() {},
}),
UIEvent: Event,
Event,
},
configurable: true,
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -338,19 +338,19 @@ BrowserListener.prototype = {
onInstallFailed(install) {
this.unregister();
},
onInstallEnded(install) {
this.unregister();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
- Ci.nsIWebProgressListener,
- Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference,
+ Ci.nsIWebProgressListener,
+ Ci.nsIObserver])
};
/**
* This represents an author of an add-on (e.g. creator or developer)
*
* @param aName
* The name of the author
* @param aURL
--- a/toolkit/mozapps/extensions/addonManager.js
+++ b/toolkit/mozapps/extensions/addonManager.js
@@ -247,14 +247,14 @@ amManager.prototype = {
throw Components.Exception("Component does not support aggregation",
Cr.NS_ERROR_NO_AGGREGATION);
if (!gSingleton)
gSingleton = new amManager();
return gSingleton.QueryInterface(aIid);
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.amIAddonManager,
- Ci.nsITimerCallback,
- Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.amIAddonManager,
+ Ci.nsITimerCallback,
+ Ci.nsIObserver])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([amManager]);
--- a/toolkit/mozapps/extensions/amContentHandler.js
+++ b/toolkit/mozapps/extensions/amContentHandler.js
@@ -77,17 +77,17 @@ amContentHandler.prototype = {
.getInterface(Ci.nsIDocShell)
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIContentFrameMessageManager);
messageManager.sendAsyncMessage(MSG_INSTALL_ADDON, install);
},
classID: Components.ID("{7beb3ba8-6ec3-41b4-b67c-da89b8518922}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentHandler]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentHandler]),
log(aMsg) {
let msg = "amContentHandler.js: " + (aMsg.join ? aMsg.join("") : aMsg);
Services.console.logStringMessage(msg);
dump(msg + "\n");
}
};
--- a/toolkit/mozapps/extensions/amInstallTrigger.js
+++ b/toolkit/mozapps/extensions/amInstallTrigger.js
@@ -107,17 +107,17 @@ RemoteMediator.prototype = {
return -1;
let callbackID = this._windowID + "-" + ++this._lastCallbackID;
let callbackObject = new CallbackObject(callbackID, callback, this);
this._callbacks.set(callbackID, callbackObject);
return callbackID;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference])
};
function InstallTrigger() {
}
InstallTrigger.prototype = {
// We've declared ourselves as providing the nsIDOMGlobalPropertyInitializer
@@ -210,14 +210,14 @@ InstallTrigger.prototype = {
return true;
} catch (e) {
return false;
}
},
classID: Components.ID("{9df8ef2b-94da-45c9-ab9f-132eb55fddf1}"),
contractID: "@mozilla.org/addons/installtrigger;1",
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIDOMGlobalPropertyInitializer])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([InstallTrigger]);
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -2195,18 +2195,18 @@ var gDiscoverView = {
for (let listener of listeners)
listener();
},
onProgressChange() { },
onStatusChange() { },
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference]),
getSelectedAddon() {
return null;
}
};
var gLegacyView = {
--- a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
@@ -153,17 +153,17 @@ class MockBlocklist {
return null;
}
getPluginBlocklistState(plugin, version, appVersion, toolkitVersion) {
return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
}
}
-MockBlocklist.prototype.QueryInterface = XPCOMUtils.generateQI(["nsIBlocklistService"]);
+MockBlocklist.prototype.QueryInterface = ChromeUtils.generateQI(["nsIBlocklistService"]);
/**
* Escapes any occurrences of &, ", < or > with XML entities.
*
* @param {string} str
* The string to escape.
* @return {string} The escaped string.
@@ -692,17 +692,17 @@ var AddonTestUtils = {
this._genuine.verifySignedDirectoryAsync(root, dir, (result, cert) => {
verifyCert(dir.clone(), result, cert, callback)
.then(([callback, result, cert]) => {
callback.verifySignedDirectoryFinished(result, cert);
});
});
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIX509CertDB]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIX509CertDB]),
};
// Unregister the real database. This only works because the add-ons manager
// hasn't started up and grabbed the certificate database yet.
MockRegistrar.register(CERTDB_CONTRACTID, FakeCertDB);
// Initialize the mock service.
Cc[CERTDB_CONTRACTID].getService();
@@ -1232,17 +1232,17 @@ var AddonTestUtils = {
var dirProvider = {
getFile(prop, persistent) {
persistent.value = false;
if (prop == key)
return dir.clone();
return null;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDirectoryServiceProvider]),
};
Services.dirsvc.registerProvider(dirProvider);
try {
Services.dirsvc.undefine(key);
} catch (e) {
// This throws if the key is not already registered, but that
// doesn't matter.
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -109,17 +109,17 @@ function GMPWrapper(aPluginInfo, aRawPlu
this, true);
if (this._plugin.isEME) {
Services.prefs.addObserver(GMPPrefs.KEY_EME_ENABLED, this, true);
Services.mm.addMessageListener("EMEVideo:ContentMediaKeysRequest", this);
}
}
GMPWrapper.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
// An active task that checks for plugin updates and installs them.
_updateTask: null,
_gmpPath: null,
_isUpdateCheckPending: false,
set gmpPath(aPath) { this._gmpPath = aPath; },
get gmpPath() {
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ b/toolkit/mozapps/extensions/nsBlocklistService.js
@@ -1491,19 +1491,19 @@ Blocklist.prototype = {
let blocklistWindow = Services.ww.openWindow(null, URI_BLOCKLIST_DIALOG, "",
"chrome,centerscreen,dialog,titlebar", args);
if (blocklistWindow)
blocklistWindow.addEventListener("unload", blocklistUnloadHandler);
},
classID: Components.ID("{66354bc9-7ed1-4692-ae1d-8da97d6b205e}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsIBlocklistService,
- Ci.nsITimerCallback]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
+ Ci.nsIBlocklistService,
+ Ci.nsITimerCallback]),
};
/*
* Helper for constructing a blocklist.
*/
function BlocklistItemData(versionRangeElement) {
var versionRange = this.getBlocklistVersionRange(versionRangeElement);
this.minVersion = versionRange.minVersion;
--- a/toolkit/mozapps/extensions/test/addons/test_cache_certdb/bootstrap.js
+++ b/toolkit/mozapps/extensions/test/addons/test_cache_certdb/bootstrap.js
@@ -38,17 +38,17 @@ function overrideCertDB() {
openSignedAppFileAsync(root, file, callback) {
callback.openSignedAppFileFinished(Cr.NS_OK, null, fakeCert);
},
verifySignedDirectoryAsync(root, dir, callback) {
callback.verifySignedDirectoryFinished(Cr.NS_OK, fakeCert);
},
- QueryInterface: XPCOMUtils.generateQI([AM_Ci.nsIX509CertDB])
+ QueryInterface: ChromeUtils.generateQI([AM_Ci.nsIX509CertDB])
};
for (let property of Object.keys(realCertDB)) {
if (property in fakeCertDB) {
continue;
}
if (typeof realCertDB[property] == "function") {
--- a/toolkit/mozapps/extensions/test/browser/browser_bug562797.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug562797.js
@@ -25,18 +25,18 @@ var gProgressListener = {
gLoadCompleteCallback = null;
},
onLocationChange() { },
onSecurityChange() { },
onProgressChange() { },
onStatusChange() { },
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference]),
};
function waitForLoad(aManager, aCallback) {
let promise = new Promise(resolve => {
var browser = aManager.document.getElementById("discover-browser");
browser.addProgressListener(gProgressListener);
gLoadCompleteCallback = function() {
--- a/toolkit/mozapps/extensions/test/browser/browser_discovery.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_discovery.js
@@ -24,18 +24,18 @@ var gProgressListener = {
gLoadCompleteCallback = null;
},
onLocationChange() { },
onSecurityChange() { },
onProgressChange() { },
onStatusChange() { },
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProgressListener,
+ Ci.nsISupportsWeakReference]),
};
function test() {
// Switch to a known url
Services.prefs.setCharPref(PREF_DISCOVERURL, MAIN_URL);
// Temporarily enable caching
Services.prefs.setBoolPref(PREF_GETADDONS_CACHE_ENABLED, true);
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_appversion.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_appversion.js
@@ -230,27 +230,27 @@ var gNewBlocks = [];
// A fake plugin host for the blocklist service to use
var PluginHost = {
getPluginTags(countRef) {
countRef.value = PLUGINS.length;
return PLUGINS;
},
- QueryInterface: XPCOMUtils.generateQI(["nsIPluginHost"]),
+ QueryInterface: ChromeUtils.generateQI(["nsIPluginHost"]),
};
var BlocklistPrompt = {
get wrappedJSObject() { return this; },
prompt(list) {
gNewBlocks = list.map(item => `${item.name} ${item.version}`);
},
- QueryInterface: XPCOMUtils.generateQI([]),
+ QueryInterface: ChromeUtils.generateQI([]),
};
async function loadBlocklist(file) {
let blocklistUpdated = TestUtils.topicObserved("blocklist-updated");
Services.prefs.setCharPref("extensions.blocklist.url",
"http://example.com/data/" + file);
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_plugin_outdated.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_plugin_outdated.js
@@ -37,32 +37,32 @@ var PLUGINS = [{
// A fake plugin host for the blocklist service to use
var PluginHost = {
getPluginTags(countRef) {
countRef.value = PLUGINS.length;
return PLUGINS;
},
- QueryInterface: XPCOMUtils.generateQI(["nsIPluginHost"]),
+ QueryInterface: ChromeUtils.generateQI(["nsIPluginHost"]),
};
var BlocklistPrompt = {
get wrappedJSObject() { return this; },
prompt(list) {
// Should only include one item
Assert.equal(list.length, 1);
// And that item should be the blocked plugin, not the outdated one
var item = list[0];
Assert.ok(item.item instanceof Ci.nsIPluginTag);
Assert.notEqual(item.name, "test_bug514327_outdated");
},
- QueryInterface: XPCOMUtils.generateQI([]),
+ QueryInterface: ChromeUtils.generateQI([]),
};
async function loadBlocklist(file) {
let blocklistUpdated = TestUtils.topicObserved("blocklist-updated");
Services.prefs.setCharPref("extensions.blocklist.url",
"http://example.com/data/" + file);
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_severities.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_severities.js
@@ -108,17 +108,17 @@ var gNotificationCheck = null;
// A fake plugin host for the blocklist service to use
var PluginHost = {
getPluginTags(countRef) {
countRef.value = PLUGINS.length;
return PLUGINS;
},
- QueryInterface: XPCOMUtils.generateQI(["nsIPluginHost"]),
+ QueryInterface: ChromeUtils.generateQI(["nsIPluginHost"]),
};
// Don't need the full interface, attempts to call other methods will just
// throw which is just fine
var WindowWatcher = {
openWindow(parent, url, name, features, windowArguments) {
// Should be called to list the newly blocklisted items
equal(url, URI_EXTENSION_BLOCKLIST_DIALOG);
@@ -126,17 +126,17 @@ var WindowWatcher = {
if (gNotificationCheck) {
gNotificationCheck(windowArguments.wrappedJSObject);
}
// run the code after the blocklist is closed
Services.obs.notifyObservers(null, "addon-blocklist-closed");
},
- QueryInterface: XPCOMUtils.generateQI(["nsIWindowWatcher"]),
+ QueryInterface: ChromeUtils.generateQI(["nsIWindowWatcher"]),
};
MockRegistrar.register("@mozilla.org/plugin/host;1", PluginHost);
MockRegistrar.register("@mozilla.org/embedcomp/window-watcher;1", WindowWatcher);
function createAddon(addon) {
return promiseInstallXPI({
name: addon.name,
--- a/toolkit/mozapps/extensions/test/xpcshell/test_moved_extension_metadata.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_moved_extension_metadata.js
@@ -23,17 +23,17 @@ userDir.append(gAppInfo.ID);
var dirProvider = {
getFile(aProp, aPersistent) {
aPersistent.value = false;
if (aProp == "XREUSysExt")
return userDir.parent;
return null;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDirectoryServiceProvider])
};
Services.dirsvc.registerProvider(dirProvider);
var addon1 = {
id: "addon1@tests.mozilla.org",
version: "1.0",
name: "Test 1",
bootstrap: true,
--- a/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_pluginchange.js
@@ -40,17 +40,17 @@ const PLUGINS = [
const gPluginHost = {
// nsIPluginHost
getPluginTags(count) {
count.value = PLUGINS.length;
return PLUGINS;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIPluginHost])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIPluginHost])
};
MockRegistrar.register("@mozilla.org/plugin/host;1", gPluginHost);
// This verifies that when the list of plugins changes the add-ons manager
// correctly updates
function run_test() {
do_test_pending();
--- a/toolkit/mozapps/extensions/test/xpinstall/head.js
+++ b/toolkit/mozapps/extensions/test/xpinstall/head.js
@@ -473,12 +473,10 @@ var Harness = {
"Completed installs should be in the right state");
this.runningInstalls.splice(this.runningInstalls.indexOf(aInstall), 1);
}, this);
break;
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsIWindowMediatorListener,
- Ci.nsISupports])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsIWindowMediatorListener])
};
--- a/toolkit/mozapps/handling/nsContentDispatchChooser.js
+++ b/toolkit/mozapps/handling/nsContentDispatchChooser.js
@@ -59,16 +59,16 @@ nsContentDispatchChooser.prototype =
CONTENT_HANDLING_URL,
null,
"chrome,dialog=yes,resizable,centerscreen",
params);
},
// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentDispatchChooser])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIContentDispatchChooser])
};
// Module
var components = [nsContentDispatchChooser];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -1223,19 +1223,19 @@ UpdatePatch.prototype = {
*/
get state() {
return this._properties.state || STATE_NONE;
},
set state(val) {
this._properties.state = val;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdatePatch,
- Ci.nsIPropertyBag,
- Ci.nsIWritablePropertyBag])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdatePatch,
+ Ci.nsIPropertyBag,
+ Ci.nsIWritablePropertyBag])
};
/**
* Update
* Implements nsIUpdate
* @param update
* An <update> element to initialize this object with
* @throws if the update contains no patches
@@ -1526,19 +1526,19 @@ Update.prototype = {
*/
getProperty: function Update_getProperty(name) {
if (name in this._properties && this._properties[name].present) {
return this._properties[name].data;
}
return null;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdate,
- Ci.nsIPropertyBag,
- Ci.nsIWritablePropertyBag])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdate,
+ Ci.nsIPropertyBag,
+ Ci.nsIWritablePropertyBag])
};
const UpdateServiceFactory = {
_instance: null,
createInstance(outer, iid) {
if (outer != null)
throw Cr.NS_ERROR_NO_AGGREGATION;
return this._instance == null ? this._instance = new UpdateService() :
@@ -2476,20 +2476,20 @@ UpdateService.prototype = {
classInfo: XPCOMUtils.generateCI({classID: UPDATESERVICE_CID,
contractID: UPDATESERVICE_CONTRACTID,
interfaces: [Ci.nsIApplicationUpdateService,
Ci.nsITimerCallback,
Ci.nsIObserver],
flags: Ci.nsIClassInfo.SINGLETON}),
_xpcom_factory: UpdateServiceFactory,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIApplicationUpdateService,
- Ci.nsIUpdateCheckListener,
- Ci.nsITimerCallback,
- Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIApplicationUpdateService,
+ Ci.nsIUpdateCheckListener,
+ Ci.nsITimerCallback,
+ Ci.nsIObserver])
};
/**
* A service to manage active and past updates.
* @constructor
*/
function UpdateManager() {
if (Services.appinfo.ID == "xpcshell@tests.mozilla.org") {
@@ -2851,17 +2851,17 @@ UpdateManager.prototype = {
/**
* See nsIUpdateService.idl
*/
cleanupActiveUpdate: function UM_cleanupActiveUpdate() {
cleanupActiveUpdate();
},
classID: Components.ID("{093C2356-4843-4C65-8709-D7DBCBBE7DFB}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdateManager, Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateManager, Ci.nsIObserver])
};
/**
* Checker
* Checks for new Updates
* @constructor
*/
function Checker() {
@@ -3175,17 +3175,17 @@ Checker.prototype = {
Services.prefs.setBoolPref(PREF_APP_UPDATE_ENABLED, this._enabled);
break;
}
this._callback = null;
},
classID: Components.ID("{898CDC9B-E43F-422F-9CC4-2F6291B415A3}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdateChecker])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateChecker])
};
/**
* Manages the download of updates
* @param background
* Whether or not this downloader is operating in background
* update mode.
* @param updateService
@@ -3818,19 +3818,19 @@ Downloader.prototype = {
if (iid.equals(Ci.nsIAuthPrompt)) {
var prompt = Cc["@mozilla.org/network/default-auth-prompt;1"].
createInstance();
return prompt.QueryInterface(iid);
}
throw Cr.NS_NOINTERFACE;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRequestObserver,
- Ci.nsIProgressEventSink,
- Ci.nsIInterfaceRequestor])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRequestObserver,
+ Ci.nsIProgressEventSink,
+ Ci.nsIInterfaceRequestor])
};
/**
* UpdatePrompt
* An object which can prompt the user with information about updates, request
* action, etc. Embedding clients can override this component with one that
* invokes a native front end.
* @constructor
@@ -4114,13 +4114,13 @@ UpdatePrompt.prototype = {
openFeatures += "," + features;
Services.ww.openWindow(parent, uri, "", openFeatures, ary);
}
},
classDescription: "Update Prompt",
contractID: "@mozilla.org/updates/update-prompt;1",
classID: Components.ID("{27ABA825-35B5-4018-9FDD-F99250A0E722}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdatePrompt])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdatePrompt])
};
var components = [UpdateService, Checker, UpdatePrompt, UpdateManager];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/toolkit/mozapps/update/nsUpdateServiceStub.js
+++ b/toolkit/mozapps/update/nsUpdateServiceStub.js
@@ -32,12 +32,12 @@ function UpdateServiceStub() {
getService(Ci.nsIApplicationUpdateService).
QueryInterface(Ci.nsIObserver);
aus.observe(null, "post-update-processing", "");
}
}
UpdateServiceStub.prototype = {
observe() {},
classID: Components.ID("{e43b0010-04ba-4da6-b523-1f92580bc150}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([UpdateServiceStub]);
--- a/toolkit/mozapps/update/tests/chrome/test_0085_error_patchApplyFailure_partial_complete_staging.xul
+++ b/toolkit/mozapps/update/tests/chrome/test_0085_error_patchApplyFailure_partial_complete_staging.xul
@@ -32,18 +32,18 @@ const testDownloadListener = {
onStatus(aRequest, aContext, aStatus, aStatusText) { },
onStopRequest(aRequest, aContext, aStatus) {
debugDump("clicking errorpatching page next button");
gDocElem.getButton("next").click();
gAUS.removeDownloadListener(this);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRequestObserver,
- Ci.nsIProgressEventSink])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRequestObserver,
+ Ci.nsIProgressEventSink])
};
let TESTS = [ {
pageid: PAGEID_ERROR_PATCHING,
extraCheckFunction: createContinueFile
}, {
pageid: PAGEID_DOWNLOADING
}, {
--- a/toolkit/mozapps/update/tests/chrome/test_0152_notify_backgroundCheckOfflineRetry.xul
+++ b/toolkit/mozapps/update/tests/chrome/test_0152_notify_backgroundCheckOfflineRetry.xul
@@ -77,17 +77,17 @@ const updateCheckListener = {
"request.status = " + status + ", " +
"update.statusText = " +
(aUpdate.statusText ? aUpdate.statusText : "null"));
gAUS.onError(aRequest, aUpdate);
// Use a timeout to allow the XHR to complete
SimpleTest.executeSoon(resetOffline);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdateCheckListener])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateCheckListener])
};
]]>
</script>
<body xmlns="http://www.w3.org/1999/xhtml">
<p id="display"></p>
<div id="content" style="display: none"></div>
--- a/toolkit/mozapps/update/tests/data/shared.js
+++ b/toolkit/mozapps/update/tests/data/shared.js
@@ -141,17 +141,17 @@ const observer = {
if (aTopic == "nsPref:changed" && aData == PREF_APP_UPDATE_CHANNEL) {
let channel = gDefaultPrefBranch.getCharPref(PREF_APP_UPDATE_CHANNEL);
if (channel != gChannel) {
debugDump("Changing channel from " + channel + " to " + gChannel);
gDefaultPrefBranch.setCharPref(PREF_APP_UPDATE_CHANNEL, gChannel);
}
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
/**
* Sets the app.update.channel preference.
*
* @param aChannel
* The update channel.
*/
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@@ -2118,17 +2118,17 @@ const gUpdateStagedObserver = {
// environment immediately after calling processUpdate can clear the
// environment before the updater is launched.
resetEnvironment();
// Use do_execute_soon to prevent any failures from propagating to the
// update service.
executeSoon(checkUpdateStagedState.bind(null, aData));
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
/**
* Stages an update using nsIUpdateProcessor:processUpdate for updater tests.
*
* @param aCheckSvcLog
* Whether the service log should be checked for service tests.
*/
@@ -3724,17 +3724,17 @@ function UpdatePrompt(aCallback) {
UpdatePrompt.prototype = {
flags: Ci.nsIClassInfo.SINGLETON,
getScriptableHelper: () => null,
getInterfaces(aCount) {
let interfaces = [Ci.nsISupports, Ci.nsIUpdatePrompt];
aCount.value = interfaces.length;
return interfaces;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIClassInfo, Ci.nsIUpdatePrompt])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIClassInfo, Ci.nsIUpdatePrompt])
};
/* Update check listener */
const updateCheckListener = {
onProgress: function UCL_onProgress(aRequest, aPosition, aTotalSize) {
},
onCheckComplete: function UCL_onCheckComplete(aRequest, aUpdates, aUpdateCount) {
@@ -3757,17 +3757,17 @@ const updateCheckListener = {
gStatusText = aUpdate.statusText ? aUpdate.statusText : null;
debugDump("url = " + gRequestURL + ", " +
"request.status = " + gStatusCode + ", " +
"update.statusText = " + gStatusText);
// Use a timeout to allow the XHR to complete
executeSoon(gCheckFunc.bind(null, aRequest, aUpdate));
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdateCheckListener])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateCheckListener])
};
/* Update download listener - nsIRequestObserver */
const downloadListener = {
onStartRequest: function DL_onStartRequest(aRequest, aContext) {
},
onProgress: function DL_onProgress(aRequest, aContext, aProgress, aMaxProgress) {
@@ -3777,18 +3777,18 @@ const downloadListener = {
},
onStopRequest: function DL_onStopRequest(aRequest, aContext, aStatus) {
gStatusResult = aStatus;
// Use a timeout to allow the request to complete
executeSoon(downloadListenerStop);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIRequestObserver,
- Ci.nsIProgressEventSink])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIRequestObserver,
+ Ci.nsIProgressEventSink])
};
/**
* Helper for starting the http server used by the tests
*/
function start_httpserver() {
let dir = getTestDirFile();
debugDump("http server directory path: " + dir.path);
@@ -3979,17 +3979,17 @@ function adjustGeneralPaths() {
return getApplyDirFile(DIR_MACOS, true);
case XRE_EXECUTABLE_FILE:
return getApplyDirFile(DIR_MACOS + FILE_APP_BIN, true);
case XRE_UPDATE_ROOT_DIR:
return getMockUpdRootD();
}
return null;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIDirectoryServiceProvider])
};
let ds = Services.dirsvc.QueryInterface(Ci.nsIDirectoryService);
ds.QueryInterface(Ci.nsIProperties).undefine(NS_GRE_DIR);
ds.QueryInterface(Ci.nsIProperties).undefine(NS_GRE_BIN_DIR);
ds.QueryInterface(Ci.nsIProperties).undefine(XRE_EXECUTABLE_FILE);
ds.registerProvider(dirProvider);
registerCleanupFunction(function AGP_cleanup() {
debugDump("start - unregistering directory provider");
@@ -4061,17 +4061,17 @@ const gAppTimerCallback = {
notify: function TC_notify(aTimer) {
gAppTimer = null;
if (gProcess.isRunning) {
logTestInfo("attempting to kill process");
gProcess.kill();
}
Assert.ok(false, "launch application timer expired");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
/**
* Launches an application to apply an update.
*/
function runUpdateUsingApp(aExpectedStatus) {
/**
* The observer for the call to nsIProcess:runAsync. When completed
@@ -4093,17 +4093,17 @@ function runUpdateUsingApp(aExpectedStat
"process-finished");
if (IS_SERVICE_TEST) {
waitForServiceStop(false);
}
executeSoon(afterAppExits);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
function afterAppExits() {
gTimeoutRuns++;
if (IS_WIN) {
waitForApplicationStop(FILE_UPDATER_BIN);
}
@@ -4284,17 +4284,17 @@ IncrementalDownload.prototype = {
get name() {
return this._name;
},
_status: 0,
get status() {
return this._status;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIIncrementalDownload])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIIncrementalDownload])
};
/**
* Sets the environment that will be used by the application process when it is
* launched.
*/
function setEnvironment() {
if (IS_WIN) {
--- a/toolkit/mozapps/update/tests/unit_aus_update/downloadCompleteAfterPartialFailure.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/downloadCompleteAfterPartialFailure.js
@@ -21,17 +21,17 @@ const WindowWatcher = {
// in doTestFinish will prevent writing the update xml files during
// shutdown.
gUpdateManager.cleanupActiveUpdate();
executeSoon(waitForUpdateXMLFiles);
}
};
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowWatcher])
};
function run_test() {
setupTestCommon();
debugDump("testing download a complete on partial failure. Calling " +
"nsIUpdatePrompt::showUpdateError should call getNewPrompter " +
"and alert on the object returned by getNewPrompter when the " +
--- a/toolkit/mozapps/update/tests/unit_aus_update/uiAutoPref.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/uiAutoPref.js
@@ -2,26 +2,26 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
const WindowWatcher = {
openWindow(aParent, aUrl, aName, aFeatures, aArgs) {
check_showUpdateAvailable();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowWatcher])
};
const WindowMediator = {
getMostRecentWindow(aWindowType) {
executeSoon(check_status);
- return { getInterface: XPCOMUtils.generateQI([Ci.nsIDOMWindow]) };
+ return { getInterface: ChromeUtils.generateQI([Ci.nsIDOMWindow]) };
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowMediator])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowMediator])
};
function run_test() {
setupTestCommon();
// Calling do_get_profile prevents an error from being logged
do_get_profile();
debugDump("testing that an update download doesn't start when the " +
--- a/toolkit/mozapps/update/tests/unit_aus_update/uiSilentPref.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/uiSilentPref.js
@@ -6,17 +6,17 @@ const WindowWatcher = {
openWindow(aParent, aUrl, aName, aFeatures, aArgs) {
do_throw("should not have called openWindow!");
},
getNewPrompter(aParent) {
do_throw("should not have seen getNewPrompter!");
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowWatcher])
};
function run_test() {
setupTestCommon();
debugDump("testing nsIUpdatePrompt notifications should not be seen " +
"when the " + PREF_APP_UPDATE_SILENT + " preference is true");
--- a/toolkit/mozapps/update/tests/unit_aus_update/uiUnsupportedAlreadyNotified.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/uiUnsupportedAlreadyNotified.js
@@ -2,25 +2,25 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
const WindowWatcher = {
openWindow(aParent, aUrl, aName, aFeatures, aArgs) {
check_showUpdateAvailable();
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowWatcher])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowWatcher])
};
const WindowMediator = {
getMostRecentWindow(aWindowType) {
return null;
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowMediator])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowMediator])
};
function run_test() {
setupTestCommon();
debugDump("testing nsIUpdatePrompt notifications should not be displayed " +
"when showUpdateAvailable is called for an unsupported system " +
"update when the unsupported notification has already been " +
--- a/toolkit/xre/test/test_launch_without_hang.js
+++ b/toolkit/xre/test/test_launch_without_hang.js
@@ -114,17 +114,17 @@ function terminateFirefox(completion) {
Assert.equal(aTopic, "process-finished",
"Terminate firefox observer topic should be " +
"process-finished");
if (completion) {
completion();
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
process.runAsync(args, args.length, processObserver);
info(" with pid: " + process.pid);
}
@@ -155,17 +155,17 @@ function launchProcess(file, args, env,
Assert.equal(state.process.exitValue, 0,
"the application process exit value should be 0");
Assert.equal(aTopic, "process-finished",
"the application process observer topic should be " +
"process-finished");
handler(true);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver])
};
// The timer callback to kill the process if it takes too long.
state.appTimerCallback = {
notify: function TC_notify(aTimer) {
state.appTimer = null;
info("Restoring environment variables");
@@ -175,17 +175,17 @@ function launchProcess(file, args, env,
info("attempting to kill process");
// This will cause the shell process to exit as well, triggering our process observer.
terminateFirefox(function terminateFirefoxCompletion() {
Assert.ok(false, "Launch application timer expired");
});
}
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsITimerCallback])
};
info("launching application: " + file.path);
info(" with args: " + args.join(" "));
info(" with environment: ");
for (let i = 0; i < env.length; ++i) {
info(" " + env[i].key + "=" + env[i].value);
}
--- a/uriloader/exthandler/HandlerService.js
+++ b/uriloader/exthandler/HandlerService.js
@@ -21,17 +21,17 @@ XPCOMUtils.defineLazyServiceGetter(this,
function HandlerService() {
// Observe handlersvc-json-replace so we can switch to the datasource
Services.obs.addObserver(this, "handlersvc-json-replace", true);
}
HandlerService.prototype = {
classID: Components.ID("{220cc253-b60f-41f6-b9cf-fdcb325f970f}"),
- QueryInterface: XPCOMUtils.generateQI([
+ QueryInterface: ChromeUtils.generateQI([
Ci.nsISupportsWeakReference,
Ci.nsIHandlerService,
Ci.nsIObserver
]),
__store: null,
get _store() {
if (!this.__store) {
@@ -197,17 +197,17 @@ HandlerService.prototype = {
// until one of its properties is accessed.
//
// Note: our caller still needs to yield periodically when iterating
// the enumerator and accessing handler properties to avoid monopolizing
// the main thread.
//
let handler = new Proxy(
{
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIHandlerInfo]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIHandlerInfo]),
type: type,
get _handlerInfo() {
delete this._handlerInfo;
return this._handlerInfo = gExternalProtocolService.getProtocolHandlerInfo(type);
},
},
{
get: function(target, name) {
--- a/uriloader/exthandler/nsWebHandlerApp.js
+++ b/uriloader/exthandler/nsWebHandlerApp.js
@@ -154,16 +154,16 @@ nsWebHandlerApp.prototype = {
set uriTemplate(aURITemplate) {
this._uriTemplate = aURITemplate;
},
//////////////////////////////////////////////////////////////////////////////
//// nsISupports
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebHandlerApp, Ci.nsIHandlerApp])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWebHandlerApp, Ci.nsIHandlerApp])
};
////////////////////////////////////////////////////////////////////////////////
//// Module
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsWebHandlerApp]);
--- a/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js
+++ b/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js
@@ -20,17 +20,17 @@ function HelperAppLauncherDialog() {
}
HelperAppLauncherDialog.prototype = {
show: function(aLauncher, aWindowContext, aReason) {
ok(true, "Showing the helper app dialog");
curDialogResolve(aWindowContext);
executeSoon(() => { aLauncher.cancel(Cr.NS_ERROR_ABORT); });
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIHelperAppLauncherDialog])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIHelperAppLauncherDialog])
};
function promiseHelperAppDialog() {
return new Promise((resolve) => {
curDialogResolve = resolve;
});
}
--- a/uriloader/exthandler/tests/mochitest/browser_download_privatebrowsing.js
+++ b/uriloader/exthandler/tests/mochitest/browser_download_privatebrowsing.js
@@ -11,17 +11,17 @@
ChromeUtils.import("resource://gre/modules/Downloads.jsm", this);
ChromeUtils.import("resource://gre/modules/DownloadPaths.jsm", this);
ChromeUtils.import("resource://testing-common/FileTestUtils.jsm", this);
ChromeUtils.import("resource://testing-common/MockRegistrar.jsm", this);
add_task(async function test_setup() {
// Save downloads to disk without showing the dialog.
let cid = MockRegistrar.register("@mozilla.org/helperapplauncherdialog;1", {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIHelperAppLauncherDialog]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIHelperAppLauncherDialog]),
show(launcher) {
launcher.saveToDisk(null, false);
},
promptForSaveToFileAsync(launcher) {
// The dialog should create the empty placeholder file.
let file = FileTestUtils.getTempFile();
file.create(Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
launcher.saveDestinationAvailable(file);
--- a/uriloader/exthandler/tests/mochitest/head.js
+++ b/uriloader/exthandler/tests/mochitest/head.js
@@ -63,17 +63,17 @@ function createMockedObjects(createHandl
cancel() {},
launchWithApplication() {},
setWebProgressListener() {},
saveDestinationAvailable() {},
contentLength: 42,
targetFile: null, // never read
// PRTime is microseconds since epoch, Date.now() returns milliseconds:
timeDownloadStarted: Date.now() * 1000,
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICancelable, Ci.nsIHelperAppLauncher])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsICancelable, Ci.nsIHelperAppLauncher])
};
registerCleanupFunction(function() {
// remove the mocked mime info from database.
let mockHandlerInfo = gMimeSvc.getFromTypeAndExtension("text/x-test-handler", null);
if (gHandlerSvc.exists(mockHandlerInfo)) {
gHandlerSvc.remove(mockHandlerInfo);
}
--- a/uriloader/exthandler/tests/mochitest/unsafeBidi_chromeScript.js
+++ b/uriloader/exthandler/tests/mochitest/unsafeBidi_chromeScript.js
@@ -7,17 +7,17 @@ const HELPERAPP_DIALOG_CID =
const FAKE_CID = Cc["@mozilla.org/uuid-generator;1"].
getService(Ci.nsIUUIDGenerator).generateUUID();
function HelperAppLauncherDialog() {}
HelperAppLauncherDialog.prototype = {
show: function(aLauncher, aWindowContext, aReason) {
sendAsyncMessage("suggestedFileName", aLauncher.suggestedFileName);
},
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIHelperAppLauncherDialog])
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIHelperAppLauncherDialog])
};
var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
registrar.registerFactory(FAKE_CID, "", HELPERAPP_DIALOG_CONTRACT,
XPCOMUtils._getFactory(HelperAppLauncherDialog));
addMessageListener("unregister", function() {
registrar.registerFactory(HELPERAPP_DIALOG_CID, "",
--- a/uriloader/exthandler/tests/unit/test_getTypeFromExtension_with_empty_Content_Type.js
+++ b/uriloader/exthandler/tests/unit/test_getTypeFromExtension_with_empty_Content_Type.js
@@ -50,17 +50,17 @@ function run_test() {
}
}
}
}
MockWindowsRegKey.prototype = {
// --- Overridden nsISupports interface functions ---
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIWindowsRegKey]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowsRegKey]),
// --- Overridden nsIWindowsRegKey interface functions ---
open: function(aRootKey, aRelPath, aMode) {
// Remember the provided root key and path
this._rootKey = aRootKey;
this._relPath = aRelPath;
--- a/widget/headless/tests/test_headless.js
+++ b/widget/headless/tests/test_headless.js
@@ -40,18 +40,18 @@ function loadContentWindow(webNavigation
let contentWindow = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow);
webProgress.removeProgressListener(progressListener);
progressListeners.delete(progressListener);
contentWindow.addEventListener("load", (event) => {
resolve(contentWindow);
}, { once: true });
},
- QueryInterface: XPCOMUtils.generateQI(["nsIWebProgressListener",
- "nsISupportsWeakReference"])
+ QueryInterface: ChromeUtils.generateQI(["nsIWebProgressListener",
+ "nsISupportsWeakReference"])
};
progressListeners.set(progressListener, progressListener);
webProgress.addProgressListener(progressListener,
Ci.nsIWebProgress.NOTIFY_LOCATION);
});
}
add_task(async function test_snapshot() {
--- a/xpcom/ds/nsINIProcessor.js
+++ b/xpcom/ds/nsINIProcessor.js
@@ -5,17 +5,17 @@
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function INIProcessorFactory() {
}
INIProcessorFactory.prototype = {
classID: Components.ID("{6ec5f479-8e13-4403-b6ca-fe4c2dca14fd}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIINIParserFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIINIParserFactory]),
createINIParser(aINIFile) {
return new INIProcessor(aINIFile);
}
}; // end of INIProcessorFactory implementation
const MODE_WRONLY = 0x02;
@@ -25,17 +25,17 @@ const MODE_TRUNCATE = 0x20;
// nsIINIParser implementation
function INIProcessor(aFile) {
this._iniFile = aFile;
this._iniData = {};
this._readFile();
}
INIProcessor.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIINIParser, Ci.nsIINIParserWriter]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIINIParser, Ci.nsIINIParserWriter]),
__utf8Converter: null, // UCS2 <--> UTF8 string conversion
get _utf8Converter() {
if (!this.__utf8Converter) {
this.__utf8Converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
createInstance(Ci.nsIScriptableUnicodeConverter);
this.__utf8Converter.charset = "UTF-8";
}
@@ -164,17 +164,17 @@ INIProcessor.prototype = {
outputStream.finish();
}
};
function stringEnumerator(stringArray) {
this._strings = stringArray;
}
stringEnumerator.prototype = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIUTF8StringEnumerator]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIUTF8StringEnumerator]),
_strings: null,
_enumIndex: 0,
hasMore() {
return (this._enumIndex < this._strings.length);
},
--- a/xpcom/tests/unit/data/child_process_directive_service.js
+++ b/xpcom/tests/unit/data/child_process_directive_service.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function TestProcessDirective() {}
TestProcessDirective.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsString]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsString]),
contractID: "@mozilla.org/xpcom/tests/ChildProcessDirectiveTest;1",
classID: Components.ID("{4bd1ba60-45c4-11e4-916c-0800200c9a66}"),
type: Ci.nsISupportsString.TYPE_STRING,
data: "child process",
toString() {
return this.data;
}
--- a/xpcom/tests/unit/data/main_process_directive_service.js
+++ b/xpcom/tests/unit/data/main_process_directive_service.js
@@ -2,17 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function TestProcessDirective() {}
TestProcessDirective.prototype = {
/* Boilerplate */
- QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsString]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsString]),
contractID: "@mozilla.org/xpcom/tests/MainProcessDirectiveTest;1",
classID: Components.ID("{9b6f4160-45be-11e4-916c-0800200c9a66}"),
type: Ci.nsISupportsString.TYPE_STRING,
data: "main process",
toString() {
return this.data;
}
--- a/xpcom/tests/unit/test_bug1434856.js
+++ b/xpcom/tests/unit/test_bug1434856.js
@@ -3,17 +3,17 @@
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
function run_test() {
let complete = false;
let runnable = {
- internalQI: XPCOMUtils.generateQI([Ci.nsIRunnable]),
+ internalQI: ChromeUtils.generateQI([Ci.nsIRunnable]),
QueryInterface(iid) {
// Attempt to schedule another runnable. This simulates a GC/CC
// being scheduled while executing the JS QI.
Services.tm.dispatchToMainThread(() => false);
return this.internalQI(iid);
},
run() {
--- a/xpcom/tests/unit/test_bug656331.js
+++ b/xpcom/tests/unit/test_bug656331.js
@@ -6,17 +6,17 @@ ChromeUtils.import("resource://gre/modul
function info(s) {
dump("TEST-INFO | test_bug656331.js | " + s + "\n");
}
var gMessageExpected = /Native module.*has version 3.*expected/;
var gFound = false;
const kConsoleListener = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIConsoleListener]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIConsoleListener]),
observe: function listener_observe(message) {
if (gMessageExpected.test(message.message))
gFound = true;
}
};
function run_test() {
--- a/xpcom/tests/unit/test_notxpcom_scriptable.js
+++ b/xpcom/tests/unit/test_notxpcom_scriptable.js
@@ -13,19 +13,19 @@ function run_test() {
let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
registrar.autoRegister(manifest);
ok(Ci.ScriptableWithNotXPCOM);
let method1Called = false;
let testObject = {
- QueryInterface: XPCOMUtils.generateQI([Ci.ScriptableOK,
- Ci.ScriptableWithNotXPCOM,
- Ci.ScriptableWithNotXPCOMBase]),
+ QueryInterface: ChromeUtils.generateQI([Ci.ScriptableOK,
+ Ci.ScriptableWithNotXPCOM,
+ Ci.ScriptableWithNotXPCOMBase]),
method1() {
method1Called = true;
},
method2() {
ok(false, "method2 should not have been called!");
},
@@ -33,17 +33,17 @@ function run_test() {
method3() {
ok(false, "mehod3 should not have been called!");
},
jsonly: true,
};
let factory = {
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory]),
+ QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory]),
createInstance(outer, iid) {
if (outer) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return testObject.QueryInterface(iid);
},
};