Commit a4e3aa46 authored by Bogdan Tara's avatar Bogdan Tara
Browse files

Backed out 2 changesets (bug 1528335) for test_ext_privacy_update.js failures CLOSED TREE 

Backed out changeset fd9468269591 (bug 1528335)
Backed out changeset acce10271d62 (bug 1528335)
parent ab147e79

toolkit/mozapps/extensions/AddonManager.jsm

+1 −5
Original line number Diff line number Diff line
@@ -1559,8 +1559,6 @@ var AddonManagerInternal = { 
   *         An optional placeholder version while the add-on is being downloaded

   * @param  {XULElement} [aOptions.browser]

   *         An optional <browser> element for download permissions prompts.

   * @param  {nsIPrincipal} [aOptions.triggeringPrincipal]

   *         The principal which is attempting to install the add-on.

   * @param  {Object} [aOptions.telemetryInfo]

   *         An optional object which provides details about the installation source

   *         included in the addon manager telemetry events.
@@ -2692,8 +2690,6 @@ var AddonManagerInternal = { 
      }



      return AddonManagerInternal.getInstallForURL(options.url, {

        browser: target,

        triggeringPrincipal: options.triggeringPrincipal,

        hash: options.hash,

        telemetryInfo: {

          source: AddonManager.getInstallSourceFromHost(options.sourceHost),

toolkit/mozapps/extensions/addonManager.js

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ amManager.prototype = { 
      name,

      icon,

      browser: aBrowser,

      triggeringPrincipal,

      telemetryInfo,

      sendCookies: true,

    }).then(aInstall => {

toolkit/mozapps/extensions/amWebAPI.jsm

+0 −1
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ class WebAPI extends APIObject { 
      sourceHost: this.window.document.nodePrincipal.URI &&

        this.window.document.nodePrincipal.URI.host,

    };

    installOptions.triggeringPrincipal = this.window.document.nodePrincipal;

    return this._apiTask("createInstall", [installOptions], installInfo => {

      if (!installInfo) {

        return null;

toolkit/mozapps/extensions/internal/XPIInstall.jsm

+1 −6
Original line number Diff line number Diff line
@@ -1803,8 +1803,6 @@ var DownloadAddonInstall = class extends AddonInstall { 
   * @param {XULElement} [options.browser]

   *        The browser performing the install, used to display

   *        authentication prompts.

   * @param {nsIPrincipal} [options.principal]

   *        The principal to use. If not present, will default to browser.contentPrincipal.

   * @param {string} [options.name]

   *        An optional name for the add-on

   * @param {string} [options.type]
@@ -1822,7 +1820,6 @@ var DownloadAddonInstall = class extends AddonInstall { 
    super(installLocation, url, options);



    this.browser = options.browser;

    this.loadingPrincipal = options.triggeringPrincipal || options.browser.contentPrincipal;

    this.sendCookies = Boolean(options.sendCookies);



    this.state = AddonManager.STATE_AVAILABLE;
@@ -1931,9 +1928,7 @@ var DownloadAddonInstall = class extends AddonInstall { 


      this.channel = NetUtil.newChannel({

        uri: this.sourceURI,

        securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS,

        contentPolicyType: Ci.nsIContentPolicy.TYPE_SAVEAS_DOWNLOAD,

        loadingPrincipal: this.loadingPrincipal,

        loadUsingSystemPrincipal: true,

      });

      this.channel.notificationCallbacks = this;

      if (this.sendCookies) {

toolkit/mozapps/extensions/test/xpinstall/browser.ini

+0 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ support-files = 
[browser_bug645699.js]

[browser_bug672485.js]

skip-if = true # disabled due to a leak. See bug 682410.

[browser_containers.js]

[browser_cookies.js]

[browser_cookies2.js]

[browser_cookies3.js]
@@ -67,7 +66,6 @@ skip-if = true # Bug 1449788 
[browser_localfile3.js]

[browser_localfile4.js]

[browser_offline.js]

[browser_privatebrowsing.js]

[browser_relative.js]

[browser_softwareupdate.js]

[browser_trigger_redirect.js]