Bug 1389992 - Remove the os_shutting_down scalar and related code. r=dexter

This commit is contained in:
Ryan VanderMeulen 2017-08-23 13:05:29 -04:00
parent f6c60389be
commit 22f5ab5cfe
3 changed files with 0 additions and 22 deletions

View File

@ -690,21 +690,6 @@ navigator.storage:
- 'main'
- 'content'
telemetry:
os_shutting_down:
bug_numbers:
- 1363345
description: >
Records true if there is a signal that Firefox was quitting because
the OS was shutting down. Only available on Windows.
expires: "58"
kind: boolean
notification_emails:
- telemetry-client-dev@mozilla.com
release_channel_collection: opt-out
record_in_processes:
- 'main'
telemetry.discarded:
accumulations:
bug_numbers:

View File

@ -796,7 +796,6 @@ var TelemetrySendImpl = {
let setOSShutdown = () => {
this._log.trace("setOSShutdown - in OS shutdown");
this._isOSShutdown = true;
Telemetry.scalarSet("telemetry.os_shutting_down", true);
};
switch (topic) {

View File

@ -1376,8 +1376,6 @@ add_task(async function test_sendShutdownPing() {
return;
}
const OSSHUTDOWN_SCALAR = "telemetry.os_shutting_down";
let checkPendingShutdownPing = async function() {
let pendingPings = await TelemetryStorage.loadPendingPingList();
Assert.equal(pendingPings.length, 2,
@ -1394,8 +1392,6 @@ add_task(async function test_sendShutdownPing() {
"The 'saved-session' ping must be saved to disk.");
Assert.equal("shutdown", shutdownPing.payload.info.reason,
"The 'shutdown' ping must be saved to disk.");
Assert.ok(shutdownPing.payload.processes.parent.scalars[OSSHUTDOWN_SCALAR],
"The OS shutdown scalar must be set to true.");
};
Preferences.set(TelemetryUtils.Preferences.ShutdownPingSender, true);
@ -1414,8 +1410,6 @@ add_task(async function test_sendShutdownPing() {
checkPingFormat(ping, ping.type, true, true);
Assert.equal(ping.payload.info.reason, REASON_SHUTDOWN);
Assert.equal(ping.clientId, gClientID);
Assert.ok(!(OSSHUTDOWN_SCALAR in ping.payload.processes.parent.scalars),
"The OS shutdown scalar must not be set.");
// Try again, this time disable ping upload. The PingSender
// should not be sending any ping!
PingServer.registerPingHandler(() => Assert.ok(false, "Telemetry must not send pings if not allowed to."));