[tbb-commits] [tor-browser/tor-browser-85.0b1-10.5-1] Bug 33342: Avoid disconnect search addon error after removal.

[gk at torproject.org]

commit 127ccffe5dcfce2803841722fbc402a7bbf7cd99
Author: Alex Catarineu <acat at torproject.org>
Date:   Fri Mar 13 18:19:30 2020 +0100

    Bug 33342: Avoid disconnect search addon error after removal.
    
    We removed the addon in #32767, but it was still being loaded
    from addonStartup.json.lz4 and throwing an error on startup
    because its resource: location is not available anymore.
---
 toolkit/mozapps/extensions/internal/XPIProvider.jsm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 92f91b843958..14c6afbf57a0 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -966,6 +966,12 @@ var BuiltInLocation = new (class _BuiltInLocation extends XPIStateLocation {
   isLinkedAddon(/* aId */) {
     return false;
   }
+
+  restore(saved) {
+    super.restore(saved);
+    // Bug 33342: avoid restoring disconnect addon from addonStartup.json.lz4.
+    this.removeAddon("disconnect at search.mozilla.org");
+  }
 })();
 
 /**