Merge remote-tracking branch 'origin/tracking' into custom

application/basilisk/components/preferences/in-content/advanced.js

@@ -208,30 +208,6 @@ var gAdvancedPane = {
 
   // DATA CHOICES TAB
 
-  /**
-   * Set up or hide the Learn More links for various data collection options
-   */
-  _setupLearnMoreLink: function (pref, element) {
-    // set up the Learn More link with the correct URL
-    let url = Services.prefs.getCharPref(pref);
-    let el = document.getElementById(element);
-
-    if (url) {
-      el.setAttribute("href", url);
-    } else {
-      el.setAttribute("hidden", "true");
-    }
-  },
-
-  /**
-   *
-   */
-  initSubmitCrashes: function ()
-  {
-    this._setupLearnMoreLink("toolkit.crashreporter.infoURL",
-                             "crashReporterLearnMore");
-  },
-
   /**
    * Initialize the health report service reference and checkbox.
    */

application/basilisk/components/preferences/in-content/jar.mn

@@ -8,7 +8,7 @@ browser.jar:
    content/browser/preferences/in-content/subdialogs.js
 
    content/browser/preferences/in-content/main.js
-*  content/browser/preferences/in-content/privacy.js
+   content/browser/preferences/in-content/privacy.js
    content/browser/preferences/in-content/containers.js
    content/browser/preferences/in-content/advanced.js
    content/browser/preferences/in-content/applications.js
@@ -16,5 +16,5 @@ browser.jar:
 #ifdef MOZ_SERVICES_SYNC
    content/browser/preferences/in-content/sync.js
 #endif
-*  content/browser/preferences/in-content/security.js
+   content/browser/preferences/in-content/security.js
    content/browser/preferences/in-content/search.js

application/basilisk/components/preferences/in-content/main.js

@@ -84,11 +84,6 @@ var gMainPane = {
               .notifyObservers(window, "main-pane-loaded", null);
   },
 
-  enableE10SChange: function ()
-  {
-    // **STUB**
-  },
-
   // HOME PAGE
 
   /*