[tbb-commits] [tor-browser] 46/64: Bug 33342: Avoid disconnect search addon error after removal.

[gitolite role]

This is an automated email from the git hooks/post-receive script.

aguestuser pushed a commit to branch geckoview-99.0b3-11.5-2
in repository tor-browser.

commit b5188710a52ef47ca17de8011daa1b0a8bd7e036
Author: Alex Catarineu <acat at torproject.org>
AuthorDate: 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 b9a7352ca277c..c8601fdac2818 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -972,6 +972,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");
+  }
 })();
 
 /**

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.