From 29006d9c15a21026b313aa445bd4ea6bd1991a5c Mon Sep 17 00:00:00 2001
From: Alex Catarineu <acat@torproject.org>
Date: Fri, 13 Mar 2020 18:19:30 +0100
Subject: [PATCH] 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 b29a118f912a6..ad9a6d924aed3 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -982,6 +982,12 @@ var BuiltInLocation = new (class _BuiltInLocation extends XPIStateLocation {
   get enumerable() {
     return false;
   }
+
+  restore(saved) {
+    super.restore(saved);
+    // Bug 33342: avoid restoring disconnect addon from addonStartup.json.lz4.
+    this.removeAddon("disconnect@search.mozilla.org");
+  }
 })();
 
 /**
-- 
GitLab