[tbb-commits] [tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Do not load Torbutton from the user's profile (only on Android)"

[gk at torproject.org]

commit 394819bf1afed389183714579d3d7ebafea0c0c0
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Dec 14 19:58:24 2018 +0000

    Revert "Bug 28640: Do not load Torbutton from the user's profile (only on Android)"
    
    This reverts commit 228b36c63fa089ce37d2713fc7b095dacdb9b338.
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 11 -----------
 toolkit/mozapps/extensions/internal/moz.build       |  5 +----
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 41391d2d6c51..ddd337038659 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1603,17 +1603,6 @@ var XPIStates = {
       for (let [id, file] of location.getAddonLocations(true)) {
         knownIds.delete(id);
 
-#if defined(TOR_BROWSER_VERSION) && defined(ANDROID)
-        // Remove Torbutton if it is installed in the user profile
-        if (id === "torbutton at torproject.org" &&
-            location.name === KEY_APP_PROFILE) {
-          logger.debug("Uninstalling Torbutton from user profile.");
-          location.uninstallAddon(id);
-          changed = true;
-          continue;
-        }
-#endif
-
         let xpiState = loc.get(id);
         if (!xpiState) {
           logger.debug("New add-on ${id} in ${location}", {id, location: location.name});
diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build
index 32b75a5cef68..8661ef7125dd 100644
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/extensions/internal/moz.build
@@ -15,11 +15,8 @@ EXTRA_JS_MODULES.addons += [
     'ProductAddonChecker.jsm',
     'SpellCheckDictionaryBootstrap.js',
     'XPIInstall.jsm',
-    'XPIProviderUtils.js',
-]
-
-EXTRA_PP_JS_MODULES.addons += [
     'XPIProvider.jsm',
+    'XPIProviderUtils.js',
 ]
 
 TESTING_JS_MODULES += [