From 0f5a239170aa285c8bc65c2dd5bfccaf0d84abd8 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Sun, 11 Aug 2019 23:31:12 +0000 Subject: [PATCH] Bug 1572582 - Merge datareporting-prefs.js into all.js. r=chutten This makes prefs definition simpler, more consistent, and less error-prone. Differential Revision: https://phabricator.services.mozilla.com/D41298 --HG-- extra : moz-landing-system : lando --- .prettierignore | 1 - modules/libpref/greprefs.js | 3 --- modules/libpref/init/all.js | 11 +++++++++++ .../components/telemetry/datareporting-prefs.js | 14 -------------- 4 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 toolkit/components/telemetry/datareporting-prefs.js diff --git a/.prettierignore b/.prettierignore index c649570dac4d..1468a586a0c9 100644 --- a/.prettierignore +++ b/.prettierignore @@ -31,7 +31,6 @@ modules/libpref/test/unit/extdata/testExt.js remote/pref/remote.js services/sync/tests/unit/prefs_test_prefs_store.js testing/marionette/prefs/marionette.js -toolkit/components/telemetry/datareporting-prefs.js toolkit/components/telemetry/healthreport-prefs.js # Ignore testing pref files which aren't parsed normally. diff --git a/modules/libpref/greprefs.js b/modules/libpref/greprefs.js index 6fbe5b0cb758..cbe8d3be2d30 100644 --- a/modules/libpref/greprefs.js +++ b/modules/libpref/greprefs.js @@ -1,8 +1,5 @@ #include init/all.js #include ../../devtools/shared/preferences/devtools-shared.js -#ifdef MOZ_DATA_REPORTING -#include ../../toolkit/components/telemetry/datareporting-prefs.js -#endif #ifdef MOZ_SERVICES_HEALTHREPORT #if MOZ_WIDGET_TOOLKIT != android #include ../../toolkit/components/telemetry/healthreport-prefs.js diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index ea27e0cda8a0..1a3d6cdda6ce 100755 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -5654,6 +5654,17 @@ pref("fission.preserve_browsing_contexts", false); // * userChrome.css pref("toolkit.legacyUserProfileCustomizations.stylesheets", false); +#ifdef MOZ_DATA_REPORTING +pref("datareporting.policy.dataSubmissionEnabled", true); +pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "0"); +pref("datareporting.policy.dataSubmissionPolicyAcceptedVersion", 0); +pref("datareporting.policy.dataSubmissionPolicyBypassNotification", false); +pref("datareporting.policy.currentPolicyVersion", 2); +pref("datareporting.policy.minimumPolicyVersion", 1); +pref("datareporting.policy.minimumPolicyVersion.channel-beta", 2); +pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/privacy/firefox/"); +#endif + pref("services.common.log.logger.rest.request", "Debug"); pref("services.common.log.logger.rest.response", "Debug"); pref("services.common.log.logger.tokenserverclient", "Debug"); diff --git a/toolkit/components/telemetry/datareporting-prefs.js b/toolkit/components/telemetry/datareporting-prefs.js deleted file mode 100644 index 0b30a23b7e8e..000000000000 --- a/toolkit/components/telemetry/datareporting-prefs.js +++ /dev/null @@ -1,14 +0,0 @@ -/* 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/. */ - -/* global pref */ - -pref("datareporting.policy.dataSubmissionEnabled", true); -pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "0"); -pref("datareporting.policy.dataSubmissionPolicyAcceptedVersion", 0); -pref("datareporting.policy.dataSubmissionPolicyBypassNotification", false); -pref("datareporting.policy.currentPolicyVersion", 2); -pref("datareporting.policy.minimumPolicyVersion", 1); -pref("datareporting.policy.minimumPolicyVersion.channel-beta", 2); -pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/privacy/firefox/");