Skip to content

Commit 9d78661

Browse files
kmaglionekmaglione
committed
Bug 1649221: Update ChromeUtils.generateQI callers to pass strings. r=mccr8,remote-protocol-reviewers,marionette-reviewers,perftest-reviewers,webcompat-reviewers,geckoview-reviewers,preferences-reviewers,agi,whimboo,Bebe,twisniewski
Differential Revision: https://phabricator.services.mozilla.com/D81594
1 parent 8d808a0 commit 9d78661

File tree

459 files changed

+1057
-1093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

459 files changed

+1057
-1093
lines changed

‎browser/base/content/browser-data-submission-info-bar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ var gDataNotificationInfoBar = {
125125
},
126126

127127
QueryInterface: ChromeUtils.generateQI([
128-
Ci.nsIObserver,
129-
Ci.nsISupportsWeakReference,
128+
"nsIObserver",
129+
"nsISupportsWeakReference",
130130
]),
131131
};

‎browser/base/content/browser-fullZoom.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ var FullZoom = {
4040
// nsISupports
4141

4242
QueryInterface: ChromeUtils.generateQI([
43-
Ci.nsIObserver,
44-
Ci.nsIContentPrefObserver,
45-
Ci.nsISupportsWeakReference,
43+
"nsIObserver",
44+
"nsIContentPrefObserver",
45+
"nsISupportsWeakReference",
4646
]),
4747

4848
// Initialization & Destruction

‎browser/base/content/browser-places.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2029,7 +2029,7 @@ var BookmarkingUI = {
20292029
this._uninitView();
20302030
},
20312031

2032-
QueryInterface: ChromeUtils.generateQI([Ci.nsINavBookmarkObserver]),
2032+
QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),
20332033
};
20342034

20352035
var AutoShowBookmarksToolbar = {

‎browser/base/content/browser-sync.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,7 @@ var gSync = {
14681468
},
14691469

14701470
QueryInterface: ChromeUtils.generateQI([
1471-
Ci.nsIObserver,
1472-
Ci.nsISupportsWeakReference,
1471+
"nsIObserver",
1472+
"nsISupportsWeakReference",
14731473
]),
14741474
};

‎browser/base/content/browser.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2648,7 +2648,7 @@ const SiteSpecificBrowserUI = {
26482648
document.getElementById("appMenu-ssb-button").hidden = false;
26492649
},
26502650

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

26542654
function HandleAppCommandEvent(evt) {
@@ -5920,7 +5920,7 @@ var TabsProgressListener = {
59205920
function nsBrowserAccess() {}
59215921

59225922
nsBrowserAccess.prototype = {
5923-
QueryInterface: ChromeUtils.generateQI([Ci.nsIBrowserDOMWindow]),
5923+
QueryInterface: ChromeUtils.generateQI(["nsIBrowserDOMWindow"]),
59245924

59255925
_openURIInNewTab(
59265926
aURI,
@@ -8431,8 +8431,8 @@ var RestoreLastSessionObserver = {
84318431
},
84328432

84338433
QueryInterface: ChromeUtils.generateQI([
8434-
Ci.nsIObserver,
8435-
Ci.nsISupportsWeakReference,
8434+
"nsIObserver",
8435+
"nsISupportsWeakReference",
84368436
]),
84378437
};
84388438

‎browser/base/content/content-refreshblocker.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ var RefreshBlocker = {
180180
},
181181

182182
QueryInterface: ChromeUtils.generateQI([
183-
Ci.nsIWebProgressListener2,
184-
Ci.nsIWebProgressListener,
185-
Ci.nsISupportsWeakReference,
183+
"nsIWebProgressListener2",
184+
"nsIWebProgressListener",
185+
"nsISupportsWeakReference",
186186
]),
187187
};
188188

‎browser/base/content/test/chrome/test_aboutCrashed.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
}
3232
},
3333

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

3838
frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor)

‎browser/base/content/test/chrome/test_aboutRestartRequired.xhtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
}
3131
},
3232

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

3737
frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor)

‎browser/base/content/test/general/browser_bug356571.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var fakePromptServiceFactory = {
2525
};
2626

2727
var promptService = {
28-
QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
28+
QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
2929
alert() {
3030
didFail = true;
3131
},

‎browser/base/content/test/general/browser_fullscreen-window-open.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,5 +362,5 @@ WindowListener.prototype = {
362362
domwindow.addEventListener("load", onLoad, true);
363363
},
364364
onCloseWindow(aXULWindow) {},
365-
QueryInterface: ChromeUtils.generateQI([Ci.nsIWindowMediatorListener]),
365+
QueryInterface: ChromeUtils.generateQI(["nsIWindowMediatorListener"]),
366366
};

‎browser/base/content/test/general/browser_homeDrop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ add_task(async function() {
3737

3838
let setHomepagePromise = new Promise(function(resolve) {
3939
let observer = {
40-
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
40+
QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
4141
observe(subject, topic, data) {
4242
is(topic, "nsPref:changed", "observed correct topic");
4343
is(data, HOMEPAGE_PREF, "observed correct data");

‎browser/base/content/test/pageActions/browser_PageActions_removeExtension.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ function mockPromptService() {
295295
let promptService = {
296296
// The prompt returns 1 for cancelled and 0 for accepted.
297297
_response: 0,
298-
QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
298+
QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
299299
confirmEx: () => promptService._response,
300300
};
301301

‎browser/base/content/test/performance/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ async function recordReflows(testPromise, win = window) {
5555
},
5656

5757
QueryInterface: ChromeUtils.generateQI([
58-
Ci.nsIReflowObserver,
59-
Ci.nsISupportsWeakReference,
58+
"nsIReflowObserver",
59+
"nsISupportsWeakReference",
6060
]),
6161
};
6262

‎browser/base/content/test/plugins/blocklist_proxy.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ var BlocklistProxy = {
2020
_uuid: null,
2121

2222
QueryInterface: ChromeUtils.generateQI([
23-
Ci.nsIObserver,
24-
Ci.nsIBlocklistService,
25-
Ci.nsITimerCallback,
23+
"nsIObserver",
24+
"nsIBlocklistService",
25+
"nsITimerCallback",
2626
]),
2727

2828
init() {

‎browser/base/content/test/siteIdentity/browser_ignore_same_page_navigation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ add_task(async function() {
2222
onStatusChange() {},
2323

2424
QueryInterface: ChromeUtils.generateQI([
25-
Ci.nsIWebProgressListener,
26-
Ci.nsISupportsWeakReference,
25+
"nsIWebProgressListener",
26+
"nsISupportsWeakReference",
2727
]),
2828
};
2929
browser.addProgressListener(progressListener, Ci.nsIWebProgress.NOTIFY_ALL);

‎browser/base/content/test/siteIdentity/browser_secure_transport_insecure_scheme.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ add_task(async function() {
129129
);
130130
// Configure Firefox to use the proxy.
131131
let systemProxySettings = {
132-
QueryInterface: ChromeUtils.generateQI([Ci.nsISystemProxySettings]),
132+
QueryInterface: ChromeUtils.generateQI(["nsISystemProxySettings"]),
133133
mainThreadOnly: true,
134134
PACURI: null,
135135
getProxyForURI: (aSpec, aScheme, aHost, aPort) => {

‎browser/base/content/test/tabs/browser_e10s_about_process.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ AboutModule.prototype = {
5656
return null;
5757
},
5858

59-
QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
59+
QueryInterface: ChromeUtils.generateQI(["nsIAboutModule"]),
6060
};
6161

6262
var AboutModuleFactory = {
@@ -71,7 +71,7 @@ var AboutModuleFactory = {
7171
throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
7272
},
7373

74-
QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory]),
74+
QueryInterface: ChromeUtils.generateQI(["nsIFactory"]),
7575
};
7676

7777
add_task(async function init() {

‎browser/components/BrowserContentHandler.jsm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,10 +383,10 @@ function nsBrowserContentHandler() {
383383
nsBrowserContentHandler.prototype = {
384384
/* nsISupports */
385385
QueryInterface: ChromeUtils.generateQI([
386-
Ci.nsICommandLineHandler,
387-
Ci.nsIBrowserHandler,
388-
Ci.nsIContentHandler,
389-
Ci.nsICommandLineValidator,
386+
"nsICommandLineHandler",
387+
"nsIBrowserHandler",
388+
"nsIContentHandler",
389+
"nsICommandLineValidator",
390390
]),
391391

392392
/* nsICommandLineHandler */

‎browser/components/BrowserGlue.jsm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4169,8 +4169,8 @@ BrowserGlue.prototype = {
41694169
},
41704170

41714171
QueryInterface: ChromeUtils.generateQI([
4172-
Ci.nsIObserver,
4173-
Ci.nsISupportsWeakReference,
4172+
"nsIObserver",
4173+
"nsISupportsWeakReference",
41744174
]),
41754175
};
41764176

@@ -4452,7 +4452,7 @@ function ContentPermissionPrompt() {}
44524452
ContentPermissionPrompt.prototype = {
44534453
classID: Components.ID("{d8903bf6-68d5-4e97-bcd1-e4d3012f721a}"),
44544454

4455-
QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPermissionPrompt]),
4455+
QueryInterface: ChromeUtils.generateQI(["nsIContentPermissionPrompt"]),
44564456

44574457
/**
44584458
* This implementation of nsIContentPermissionPrompt.prompt ensures
@@ -4873,8 +4873,8 @@ var JawsScreenReaderVersionCheck = {
48734873
},
48744874

48754875
QueryInterface: ChromeUtils.generateQI([
4876-
Ci.nsIObserver,
4877-
Ci.nsISupportsWeakReference,
4876+
"nsIObserver",
4877+
"nsISupportsWeakReference",
48784878
]),
48794879

48804880
observe(subject, topic, data) {
@@ -5722,8 +5722,8 @@ var AboutHomeStartupCache = {
57225722
},
57235723

57245724
QueryInterface: ChromeUtils.generateQI([
5725-
Ci.nsICacheEntryOpenallback,
5726-
Ci.nsIObserver,
5725+
"nsICacheEntryOpenallback",
5726+
"nsIObserver",
57275727
]),
57285728

57295729
/** MessageListener **/

‎browser/components/doh/TRRPerformance.jsm

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@ class DNSLookup {
141141
}
142142
}
143143

144-
DNSLookup.prototype.QueryInterface = ChromeUtils.generateQI([
145-
Ci.nsIDNSListener,
146-
]);
144+
DNSLookup.prototype.QueryInterface = ChromeUtils.generateQI(["nsIDNSListener"]);
147145

148146
// A wrapper around a single set of measurements. The required lookups are
149147
// triggered and the results aggregated before telemetry is sent. If aborted,

‎browser/components/downloads/DownloadsCommon.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ const TELEMETRY_EVENT_CATEGORY = "downloads";
196196

197197
var PrefObserver = {
198198
QueryInterface: ChromeUtils.generateQI([
199-
Ci.nsIObserver,
200-
Ci.nsISupportsWeakReference,
199+
"nsIObserver",
200+
"nsISupportsWeakReference",
201201
]),
202202
getPref(name) {
203203
try {

‎browser/components/enterprisepolicies/Policies.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2195,7 +2195,7 @@ let ChromeURLBlockPolicy = {
21952195
classDescription: "Policy Engine Content Policy",
21962196
contractID: "@mozilla-org/policy-engine-content-policy-service;1",
21972197
classID: Components.ID("{ba7b9118-cabc-4845-8b26-4215d2a59ed7}"),
2198-
QueryInterface: ChromeUtils.generateQI([Ci.nsIContentPolicy]),
2198+
QueryInterface: ChromeUtils.generateQI(["nsIContentPolicy"]),
21992199
createInstance(outer, iid) {
22002200
return this.QueryInterface(iid);
22012201
},

‎browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ function WebsiteFilter(blocklist, exceptionlist) {
8787

8888
WebsiteFilter.prototype = {
8989
QueryInterface: ChromeUtils.generateQI([
90-
Ci.nsIObserver,
91-
Ci.nsISupportsWeakReference,
90+
"nsIObserver",
91+
"nsISupportsWeakReference",
9292
]),
9393

9494
observe(subject, topic, data) {

‎browser/components/extensions/parent/ext-tabs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,7 +1457,7 @@ this.tabs = class extends ExtensionAPI {
14571457
}
14581458
},
14591459
QueryInterface: ChromeUtils.generateQI([
1460-
Ci.nsIWebProgressListener,
1460+
"nsIWebProgressListener",
14611461
]),
14621462
};
14631463

‎browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ add_task(async function browseraction_contextmenu_remove_extension() {
457457
let { prompt } = Services;
458458
let promptService = {
459459
_response: 1,
460-
QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
460+
QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
461461
confirmEx: function(...args) {
462462
promptService._confirmExArgs = args;
463463
return promptService._response;

‎browser/components/installerprefs/InstallerPrefs.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ InstallerPrefs.prototype = {
6464
classID: Components.ID("{cd8a6995-1f19-4cdd-9ed1-d6263302f594}"),
6565
contractID: "@mozilla.org/installerprefs;1",
6666

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

6969
observe(subject, topic, data) {
7070
switch (topic) {

‎browser/components/migration/MigrationUtils.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ function getL10n() {
126126
* 6. For startup-only migrators, override |startupOnlyMigrator|.
127127
*/
128128
var MigratorPrototype = {
129-
QueryInterface: ChromeUtils.generateQI([Ci.nsIBrowserProfileMigrator]),
129+
QueryInterface: ChromeUtils.generateQI(["nsIBrowserProfileMigrator"]),
130130

131131
/**
132132
* OVERRIDE IF AND ONLY IF the source supports multiple profiles.

‎browser/components/migration/ProfileMigrator.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function ProfileMigrator() {}
1212

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

‎browser/components/newtab/AboutNewTabService.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ class BaseAboutNewTabService {
311311

312312
this.classID = Components.ID("{cb36c925-3adc-49b3-b720-a5cc49d8a40e}");
313313
this.QueryInterface = ChromeUtils.generateQI([
314-
Ci.nsIAboutNewTabService,
315-
Ci.nsIObserver,
314+
"nsIAboutNewTabService",
315+
"nsIObserver",
316316
]);
317317
}
318318

‎browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ class AboutWelcomeChild extends JSWindowActorChild {
8484

8585
const listener = {
8686
QueryInterface: ChromeUtils.generateQI([
87-
Ci.nsIWebProgressListener,
88-
Ci.nsISupportsWeakReference,
87+
"nsIWebProgressListener",
88+
"nsISupportsWeakReference",
8989
]),
9090
};
9191

‎browser/components/newtab/lib/PlacesFeed.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Observer {
4141
this.dispatch = dispatch;
4242
this.QueryInterface = ChromeUtils.generateQI([
4343
observerInterface,
44-
Ci.nsISupportsWeakReference,
44+
"nsISupportsWeakReference",
4545
]);
4646
}
4747
}

‎browser/components/payments/PaymentUIService.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function PaymentUIService() {
5151

5252
PaymentUIService.prototype = {
5353
classID: Components.ID("{01f8bd55-9017-438b-85ec-7c15d2b35cdc}"),
54-
QueryInterface: ChromeUtils.generateQI([Ci.nsIPaymentUIService]),
54+
QueryInterface: ChromeUtils.generateQI(["nsIPaymentUIService"]),
5555

5656
// nsIPaymentUIService implementation:
5757

‎browser/components/payments/content/paymentDialogWrapper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ var paymentDialogWrapper = {
137137
temporaryStore: null,
138138

139139
QueryInterface: ChromeUtils.generateQI([
140-
Ci.nsIObserver,
141-
Ci.nsISupportsWeakReference,
140+
"nsIObserver",
141+
"nsISupportsWeakReference",
142142
]),
143143

144144
/**

0 commit comments

Comments
 (0)