[tbb-commits] [tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop

[gk at torproject.org]

commit a71b2382c0405e9c707b790de570672ec885750e
Author: Alex Catarineu <acat at torproject.org>
Date:   Tue Sep 8 18:52:34 2020 +0200

    fixup! Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index d199ac48ecae..dc5362bce3d8 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1491,9 +1491,14 @@ var XPIStates = {
           continue;
         }
 
-        // Uninstall non-builtin https-everywhere-eff extension.
-        if (id === "https-everywhere-eff at eff.org" && !loc.isBuiltin) {
-          logger.debug("Uninstalling the HTTPS Everywhere extension.");
+        // Uninstall HTTPS Everywhere if it is installed in the user profile.
+        if (
+          id === "https-everywhere-eff at eff.org" &&
+          loc.name === KEY_APP_PROFILE
+        ) {
+          logger.debug(
+            "Uninstalling the HTTPS Everywhere extension from user profile."
+          );
           loc.installer.uninstallAddon(id);
           changed = true;
           continue;