mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 22:28:59 +02:00
e930b89c34
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
46 lines
1.6 KiB
JavaScript
46 lines
1.6 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
http://creativecommons.org/publicdomain/zero/1.0/
|
|
*/
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
const {TelemetryController} = ChromeUtils.import("resource://gre/modules/TelemetryController.jsm");
|
|
const {ContentTaskUtils} = ChromeUtils.import("resource://testing-common/ContentTaskUtils.jsm");
|
|
|
|
const SOCKET_ONLY_UINT_SCALAR = "telemetry.test.socket_only_uint";
|
|
|
|
/**
|
|
* This function waits until socket scalars are reported into the
|
|
* scalar snapshot.
|
|
*/
|
|
async function waitForSocketScalars() {
|
|
await ContentTaskUtils.waitForCondition(() => {
|
|
const scalars = Telemetry.getSnapshotForScalars("main", false);
|
|
return Object.keys(scalars).includes("socket");
|
|
});
|
|
}
|
|
|
|
add_task(async function() {
|
|
if (!Services.prefs.getBoolPref("network.process.enabled")) {
|
|
Assert.ok(true, "Test finished: no point to test telemetry from socket process with lanuching the process");
|
|
return;
|
|
}
|
|
|
|
do_test_pending();
|
|
|
|
do_get_profile(true);
|
|
await TelemetryController.testSetup();
|
|
|
|
Services.netUtils.socketProcessTelemetryPing();
|
|
|
|
// Once scalars are set by the socket process, they don't immediately get
|
|
// sent to the parent process. Wait for the Telemetry IPC Timer to trigger
|
|
// and batch send the data back to the parent process.
|
|
await waitForSocketScalars();
|
|
|
|
Assert.equal(Telemetry.getSnapshotForScalars("main", false)
|
|
.socket[SOCKET_ONLY_UINT_SCALAR],
|
|
42,
|
|
`${SOCKET_ONLY_UINT_SCALAR} must have the correct value (socket process).`);
|
|
do_test_finished();
|
|
});
|
|
|