Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 1 insertions, 12 deletions

diff --git a/testing/specialpowers/content/SpecialPowersChild.sys.mjs b/testing/specialpowers/content/SpecialPowersChild.sys.mjs
index 61070fe4ce..ef81af911c 100644
--- a/testing/specialpowers/content/SpecialPowersChild.sys.mjs
+++ b/testing/specialpowers/content/SpecialPowersChild.sys.mjs
@@ -1137,15 +1137,6 @@ export class SpecialPowersChild extends JSWindowActorChild {
       Ci.nsIFormFillController
     );
   }
-  attachFormFillControllerTo(window) {
-    this.getFormFillController().attachPopupElementToDocument(
-      window.document,
-      this._getAutoCompletePopup(window)
-    );
-  }
-  detachFormFillControllerFrom(window) {
-    this.getFormFillController().detachFromDocument(window.document);
-  }
   isBackButtonEnabled(window) {
     return !this._getTopChromeWindow(window)
       .document.getElementById("Browser:Back")
diff --git a/testing/specialpowers/content/SpecialPowersParent.sys.mjs b/testing/specialpowers/content/SpecialPowersParent.sys.mjs
index e0ce35bb67..a21527755f 100644
--- a/testing/specialpowers/content/SpecialPowersParent.sys.mjs
+++ b/testing/specialpowers/content/SpecialPowersParent.sys.mjs
@@ -1341,9 +1341,7 @@ export class SpecialPowersParent extends JSWindowActorParent {
           let id = aMessage.data.id;
           let extension = this._extensions.get(id);
           this._extensions.delete(id);
-          return extension.shutdown().then(() => {
-            return extension._uninstallPromise;
-          });
+          return lazy.ExtensionTestCommon.unloadTestExtension(extension);
         }
 
         case "SPExtensionTerminateBackground": {