Backed out changeset 31a809d5ca1a (bug 1364068) for valgrind bustage

--HG-- extra : rebase_source : 97ee6c0cf8677a55967c8e7a2b8722fdc0cf0378
dothq · May 23, 2017 · aa25343 · aa25343
1 parent 870e162
commit aa25343
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -1459,8 +1459,6 @@ pref("browser.translation.engine", "bing");
 pref("toolkit.telemetry.archive.enabled", true);
 // Enables sending the shutdown ping when Firefox shuts down.
 pref("toolkit.telemetry.shutdownPingSender.enabled", true);
-// Enables sending the 'new-profile' ping on new profiles.
-pref("toolkit.telemetry.newProfilePing.enabled", true);
 
 // Telemetry experiments settings.
 pref("experiments.enabled", true);

diff --git a/toolkit/components/telemetry/tests/unit/head.js b/toolkit/components/telemetry/tests/unit/head.js
@@ -307,11 +307,10 @@ if (runningInParent) {
   Services.prefs.setBoolPref("datareporting.policy.dataSubmissionPolicyBypassNotification", true);
   // FHR uploads should be enabled.
   Services.prefs.setBoolPref("datareporting.healthreport.uploadEnabled", true);
-  // Many tests expect the shutdown and the new-profile to not be sent on shutdown
-  // and will fail if receive an unexpected ping. Let's globally disable these features:
-  // the relevant tests will enable these prefs when needed.
+  // Many tests expect the shutdown ping to not be sent on shutdown and will fail
+  // if receive an unexpected ping. Let's globally disable the shutdown ping sender:
+  // the relevant tests will enable this pref when needed.
   Services.prefs.setBoolPref("toolkit.telemetry.shutdownPingSender.enabled", false);
-  Services.prefs.setBoolPref("toolkit.telemetry.newProfilePing.enabled", false);
   // Ensure browser experiments are also disabled, to avoid network activity
   // when toggling PREF_ENABLED.
   Services.prefs.setBoolPref("experiments.enabled", false);