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

@@ -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.

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

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");

toolkit/components/telemetry/datareporting-prefs.js

@@ -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/");