Bug 804745 - Part b: Fix bustage due to apparent preprocessor limitation; r=rnewman, a=akeybl
authorGregory Szorc <gps@mozilla.com>
Fri, 11 Jan 2013 21:42:47 -0800
changeset 127234 6776a3d000d5bb72f7f612f5c521f359e9ebedaf
parent 127233 b0f512680a8db3b9a8ba2643319e7308c0177e1c
child 127235 2c1c792ffc026ab61eb62fd665d4490f2a06146d
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman, akeybl
bugs804745
milestone20.0a2
Bug 804745 - Part b: Fix bustage due to apparent preprocessor limitation; r=rnewman, a=akeybl
browser/base/content/browser-data-submission-info-bar.js
services/datareporting/DataReportingService.js
services/datareporting/modules-testing/mocks.jsm
services/datareporting/policy.jsm
services/datareporting/tests/xpcshell/test_policy.js
--- a/browser/base/content/browser-data-submission-info-bar.js
+++ b/browser/base/content/browser-data-submission-info-bar.js
@@ -24,17 +24,17 @@ DataNotificationInfoBar.prototype = {
 
 #ifdef MOZ_TELEMETRY_REPORTING
 #ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
   _PREF_TELEMETRY_DISPLAYED: "toolkit.telemetry.notifiedOptOut",
 #else
   _PREF_TELEMETRY_DISPLAYED: "toolkit.telemetry.prompted",
 #endif
 
-  _TELEMETRY_DISPLAY_REV: @MOZ_TELEMETRY_DISPLAY_REV@,
+  _TELEMETRY_DISPLAY_REV: 2,
 #endif
 
   init: function() {
     window.addEventListener("unload", function onUnload() {
       window.removeEventListener("unload", onUnload, false);
 
       for (let o of this._OBSERVERS) {
         Services.obs.removeObserver(this, o);