Bug 1549075 Follow-up: Fix system addon test on CLOSED TREE r=kmag a=bustage
authorAndrew Swan <aswan@mozilla.com>
Sat, 04 May 2019 22:12:55 -0700
changeset 531371 445c0c44fa894aadf3ebf849fef5bdb0aa4c547d
parent 531370 7995904ca18e2d85e768bc4317c56c1cddff44aa
child 531372 7620ecc6c5349a3808aa915757dd5c36421d8433
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskmag, bustage
bugs1549075
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1549075 Follow-up: Fix system addon test on CLOSED TREE r=kmag a=bustage
toolkit/mozapps/extensions/internal/XPIDatabase.jsm
--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
@@ -2828,17 +2828,17 @@ this.XPIDatabaseReconcile = {
     }
 
     if (promises.some(p => p)) {
       XPIInternal.awaitPromise(Promise.all(promises));
     }
 
     for (let [id, addon] of previousVisible) {
       if (addon.location) {
-        if (addon.location.isBuiltin) {
+        if (addon.location.name == KEY_APP_BUILTINS) {
           continue;
         }
         if (addonExists(addon)) {
           XPIInternal.BootstrapScope.get(addon).uninstall();
         }
         addon.location.removeAddon(id);
         addon.visible = false;
         addon.active = false;