Bug 1515712 - add default pref and start corroborator if enabled r=kmag
☠☠ backed out by 785fe31ffe40 ☠ ☠
authorRobert Helmer <rhelmer@mozilla.com>
Fri, 19 Apr 2019 22:54:49 +0000
changeset 470271 3e46d5fddd21e7627b010165013bea891bffcace
parent 470270 acb99631797adfa7d57550249bcc3ee9fc98ac72
child 470272 4c5a5b50c951ff946b39c178b080762e63043111
push id35891
push userrgurzau@mozilla.com
push dateSat, 20 Apr 2019 09:35:22 +0000
treeherdermozilla-central@6e082b675763 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskmag
bugs1515712
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1515712 - add default pref and start corroborator if enabled r=kmag Depends on D15123 Differential Revision: https://phabricator.services.mozilla.com/D28250
browser/app/profile/firefox.js
browser/components/BrowserGlue.jsm
toolkit/components/telemetry/Scalars.yaml
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1874,8 +1874,15 @@ pref("browser.aboutConfig.showWarning", 
 pref("browser.toolbars.keyboard_navigation", true);
 
 // Prefs to control the Firefox Account toolbar menu.
 // This pref will surface existing Firefox Account information
 // as a button next to the hamburger menu. It allows
 // quick access to sign-in and manage your Firefox Account.
 pref("identity.fxaccounts.toolbar.enabled", true);
 pref("identity.fxaccounts.toolbar.accessed", false);
+
+// Check bundled JAR and XPI files for corruption.
+#ifdef RELEASE_OR_BETA
+pref("corroborator.enabled", false);
+#else
+pref("corroborator.enabled", true);
+#endif
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -386,16 +386,17 @@ XPCOMUtils.defineLazyModuleGetters(this,
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
   AutoCompletePopup: "resource://gre/modules/AutoCompletePopup.jsm",
   Blocklist: "resource://gre/modules/Blocklist.jsm",
   BookmarkHTMLUtils: "resource://gre/modules/BookmarkHTMLUtils.jsm",
   BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.jsm",
   BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.jsm",
+  Corroborate: "resource://gre/modules/Corroborate.jsm",
   DateTimePickerParent: "resource://gre/modules/DateTimePickerParent.jsm",
   Discovery: "resource:///modules/Discovery.jsm",
   ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
   FileSource: "resource://gre/modules/L10nRegistry.jsm",
   FxAccounts: "resource://gre/modules/FxAccounts.jsm",
   HomePage: "resource:///modules/HomePage.jsm",
   HybridContentTelemetry: "resource://gre/modules/HybridContentTelemetry.jsm",
   Integration: "resource://gre/modules/Integration.jsm",
@@ -1569,16 +1570,20 @@ BrowserGlue.prototype = {
       }
     };
     this._idleService.addIdleObserver(
       this._lateTasksIdleObserver, LATE_TASKS_IDLE_TIME_SEC);
 
     this._monitorScreenshotsPref();
     this._monitorWebcompatReporterPref();
 
+    if (Services.prefs.getBoolPref("corroborator.enabled", true)) {
+      Corroborate.init().catch(Cu.reportError);
+    }
+
     let pService = Cc["@mozilla.org/toolkit/profile-service;1"].
                   getService(Ci.nsIToolkitProfileService);
     if (pService.createdAlternateProfile) {
       this._showNewInstallModal();
     }
   },
 
   /**
--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -14,17 +14,16 @@ a11y:
     kind: string
     notification_emails:
       - accessibility@mozilla.com
       - jteh@mozilla.com
     record_in_processes:
       - 'main'
     release_channel_collection: opt-out
     keyed: false
-    cpp_guard: 'ACCESSIBILITY'
 
   indicator_acted_on:
     bug_numbers:
       - 1412358
     description: >
       Recorded on click or SPACE/ENTER keypress event. Boolean stating if the
       accessibility indicactor button was acted on.
     expires: "62"