Bug 829881 - Part 2: Re-enable pre-processing of about:telemetry; r=tchevalier, a=akeybl
authorGregory Szorc <gps@mozilla.com>
Tue, 15 Jan 2013 17:53:09 -0800
changeset 127243 b08ac3e59f6346661f1b48c81c16c97cd8242786
parent 127242 77ac5f84e113519b51089d14cdc329582a761dc4
child 127244 0836a971d9265a627750af069f66c969603ed56e
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)
reviewerstchevalier, akeybl
bugs829881
milestone20.0a2
Bug 829881 - Part 2: Re-enable pre-processing of about:telemetry; r=tchevalier, a=akeybl
services/datareporting/DataReportingService.js
services/datareporting/modules-testing/mocks.jsm
services/datareporting/policy.jsm
services/datareporting/tests/xpcshell/test_policy.js
toolkit/content/aboutTelemetry.js
toolkit/content/jar.mn
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -672,30 +672,16 @@ function onLoad() {
   window.removeEventListener("load", onLoad);
 
   // Set the text in the page header
   setupPageHeader();
 
   // Set up event listeners
   setupListeners();
 
-#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
-  /**
-   * When telemetry is opt-out, verify if the user explicitly rejected the
-   * telemetry prompt, and if so reflect his choice in the current preference
-   * value. This doesn't cover the case where the user refused telemetry in the
-   * prompt but later enabled it in preferences in builds before the fix for
-   * bug 737600.
-   */
-  if (getPref(PREF_TELEMETRY_ENABLED, false) &&
-      getPref(PREF_TELEMETRY_REJECTED, false)) {
-    Services.prefs.setBoolPref(PREF_TELEMETRY_ENABLED, false);
-  }
-#endif
-
   // Show slow SQL stats
   SlowSQL.render();
 
   // Show chrome hang stacks
   ChromeHangs.render();
 
   // Show histogram data
   let histograms = Telemetry.histogramSnapshots;
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -11,17 +11,17 @@ toolkit.jar:
    content/global/textbox.css                 (textbox.css)
    content/global/menulist.css                (menulist.css)
    content/global/about.xhtml                 (about.xhtml)
    content/global/aboutAbout.xhtml            (aboutAbout.xhtml)
    content/global/aboutRights.xhtml           (aboutRights.xhtml)
    content/global/aboutRights-unbranded.xhtml (aboutRights-unbranded.xhtml)
 *  content/global/aboutSupport.js
 *  content/global/aboutSupport.xhtml
-   content/global/aboutTelemetry.js
+*  content/global/aboutTelemetry.js
 *  content/global/aboutTelemetry.xhtml
    content/global/aboutTelemetry.css          (aboutTelemetry.css)
    content/global/directionDetector.html
    content/global/plugins.html
    content/global/plugins.css
 *+  content/global/buildconfig.html            (buildconfig.html)
 +  content/global/charsetOverlay.js           (charsetOverlay.js)
 +  content/global/charsetOverlay.xul          (charsetOverlay.xul)