From f6fa3435f2d5d5ab4c9cbcc311d02c2003a61bb2 Mon Sep 17 00:00:00 2001 From: Chris Pearce Date: Mon, 29 Oct 2018 16:23:33 +1300 Subject: [PATCH] Bug 1502779 - Backed out changeset 38c1fc84fcaf (bug 1500251). r=backout The telemetry added in bug 1500251 is no longer needed, so should be backed out. --- modules/libpref/init/all.js | 3 +-- toolkit/components/telemetry/app/TelemetryEnvironment.jsm | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 708b11ce32ea..eb54a3b745f3 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -5950,6 +5950,5 @@ pref("prio.enabled", false); #ifdef NIGHTLY_BUILD // Bug 1499552; add a dummy pref to verify that collection of preferences // via telemetry is working as expected. -pref("app.normandy.test.with_true_default", true); -pref("app.normandy.test.with_false_default", false); +pref("app.normandy.test.with_default", false); #endif diff --git a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm b/toolkit/components/telemetry/app/TelemetryEnvironment.jsm index 0e38b008c0f8..0b699b218f0b 100644 --- a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm +++ b/toolkit/components/telemetry/app/TelemetryEnvironment.jsm @@ -183,8 +183,7 @@ const DEFAULT_ENVIRONMENT_PREFS = new Map([ ["app.support.baseURL", {what: RECORD_PREF_VALUE}], ["accessibility.browsewithcaret", {what: RECORD_PREF_VALUE}], ["accessibility.force_disabled", {what: RECORD_PREF_VALUE}], - ["app.normandy.test.with_true_default", {what: RECORD_PREF_VALUE}], - ["app.normandy.test.with_false_default", {what: RECORD_PREF_VALUE}], + ["app.normandy.test.with_default", {what: RECORD_PREF_VALUE}], ["app.normandy.test.without_default", {what: RECORD_PREF_VALUE}], ["app.shield.optoutstudies.enabled", {what: RECORD_PREF_VALUE}], ["app.update.auto", {what: RECORD_PREF_VALUE}],