[tbb-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27762: Remove workarounds that allowed torbutton extension to load

[gk at torproject.org]

commit 057daaf3fa81f46d4a3653115990b462fe7b2551
Author: Igor Oliveira <igt0 at torproject.org>
Date:   Tue Dec 4 07:18:46 2018 -0200

    Bug 27762: Remove workarounds that allowed torbutton extension to load
    
    Since torbutton became a system extension, those workarounds
    (implemented in #27220 and #27271+#27763) are not needed anymore.
---
 mobile/android/app/000-tor-browser-android.js      | 5 -----
 toolkit/mozapps/extensions/internal/XPIInstall.jsm | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index e7e337276acb..de51ec125406 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -54,10 +54,5 @@ pref("media.realtime_decoder.enabled", false);
 pref("general.useragent.updates.enabled", false);
 pref("general.useragent.updates.url", "");
 
-// Do not allow the user to install extensions from web
-pref("xpinstall.enabled", false);
-pref("extensions.enabledScopes", 1);
-pref("extensions.autoDisableScopes", 1);
-
 // Enable touch events on Android (highlighting text, etc)
 pref("dom.w3c_touch_events.enabled", 2);
diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
index 40b3b1d6434e..f97669951710 100644
--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
@@ -1029,11 +1029,6 @@ function getSignedStatus(aRv, aCert, aAddonID) {
 }
 
 function shouldVerifySignedState(aAddon) {
-  if (AppConstants.platform === "android" &&
-      aAddon.id === "torbutton at torproject.org") {
-    return false;
-  }
-
   // Updated system add-ons should always have their signature checked
   if (aAddon._installLocation.name == KEY_APP_SYSTEM_ADDONS)
     return true;