Bug 855371 - @MOZ_UPDATE_CHANNEL@ in health report prefs. r=gps, a=lsblakk
authorRichard Newman <rnewman@mozilla.com>
Mon, 08 Apr 2013 10:54:20 -0700
changeset 133429 cdec0ba6a5742b17f54fe67a3273016755e433e1
parent 133428 882d023c79f002c3126223b6bf93700f0e0eb6a0
child 133430 bb36cb83def8b71f21d5bb99f82495ada0e5506c
push id3645
push userryanvm@gmail.com
push dateWed, 17 Apr 2013 20:50:10 +0000
treeherdermozilla-aurora@12e463ae355c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, lsblakk
bugs855371
milestone22.0a2
Bug 855371 - @MOZ_UPDATE_CHANNEL@ in health report prefs. r=gps, a=lsblakk
services/healthreport/healthreport-prefs.js
--- a/services/healthreport/healthreport-prefs.js
+++ b/services/healthreport/healthreport-prefs.js
@@ -1,8 +1,9 @@
+#filter substitution
 /* 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/. */
 
 pref("datareporting.healthreport.currentDaySubmissionFailureCount", 0);
 pref("datareporting.healthreport.documentServerURI", "https://data.mozilla.com/");
 pref("datareporting.healthreport.documentServerNamespace", "metrics");
 pref("datareporting.healthreport.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#health-report");
@@ -21,14 +22,16 @@ pref("datareporting.healthreport.uploadE
 
 pref("datareporting.healthreport.service.enabled", true);
 pref("datareporting.healthreport.service.loadDelayMsec", 10000);
 pref("datareporting.healthreport.service.loadDelayFirstRunMsec", 60000);
 
 pref("datareporting.healthreport.service.providerCategories",
 #if MOZ_UPDATE_CHANNEL == release
     "healthreport-js-provider-default"
+#elif MOZ_UPDATE_CHANNEL == default
+    "healthreport-js-provider-default"
 #else
     "healthreport-js-provider-default,healthreport-js-provider-@MOZ_UPDATE_CHANNEL@"
 #endif
     );
 
 pref("datareporting.healthreport.about.reportUrl",   "https://fhr.cdn.mozilla.net/%LOCALE%/");