1 files changed, 9 insertions, 25 deletions

diff --git a/components/script/dom/navigationpreloadmanager.rs b/components/script/dom/navigationpreloadmanager.rs
index e0d1d6e6c59..94a9f0056c6 100644
--- a/components/script/dom/navigationpreloadmanager.rs
+++ b/components/script/dom/navigationpreloadmanager.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use crate::compartments::{AlreadyInCompartment, InCompartment};
+use crate::compartments::InCompartment;
 use crate::dom::bindings::codegen::Bindings::NavigationPreloadManagerBinding::NavigationPreloadState;
 use crate::dom::bindings::codegen::Bindings::NavigationPreloadManagerBinding::{
     NavigationPreloadManagerMethods, Wrap,
@@ -44,12 +44,8 @@ impl NavigationPreloadManager {
 
 impl NavigationPreloadManagerMethods for NavigationPreloadManager {
     // https://w3c.github.io/ServiceWorker/#navigation-preload-manager-enable
-    fn Enable(&self) -> Rc<Promise> {
-        let in_compartment_proof = AlreadyInCompartment::assert(&*self.global());
-        let promise = Promise::new_in_current_compartment(
-            &*self.global(),
-            InCompartment::Already(&in_compartment_proof),
-        );
+    fn Enable(&self, comp: InCompartment) -> Rc<Promise> {
+        let promise = Promise::new_in_current_compartment(&*self.global(), comp);
 
         // 2.
         if self.serviceworker_registration.active().is_none() {
@@ -70,12 +66,8 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager {
     }
 
     // https://w3c.github.io/ServiceWorker/#navigation-preload-manager-disable
-    fn Disable(&self) -> Rc<Promise> {
-        let in_compartment_proof = AlreadyInCompartment::assert(&*self.global());
-        let promise = Promise::new_in_current_compartment(
-            &*self.global(),
-            InCompartment::Already(&in_compartment_proof),
-        );
+    fn Disable(&self, comp: InCompartment) -> Rc<Promise> {
+        let promise = Promise::new_in_current_compartment(&*self.global(), comp);
 
         // 2.
         if self.serviceworker_registration.active().is_none() {
@@ -96,12 +88,8 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager {
     }
 
     // https://w3c.github.io/ServiceWorker/#navigation-preload-manager-setheadervalue
-    fn SetHeaderValue(&self, value: ByteString) -> Rc<Promise> {
-        let in_compartment_proof = AlreadyInCompartment::assert(&*self.global());
-        let promise = Promise::new_in_current_compartment(
-            &*self.global(),
-            InCompartment::Already(&in_compartment_proof),
-        );
+    fn SetHeaderValue(&self, value: ByteString, comp: InCompartment) -> Rc<Promise> {
+        let promise = Promise::new_in_current_compartment(&*self.global(), comp);
 
         // 2.
         if self.serviceworker_registration.active().is_none() {
@@ -122,12 +110,8 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager {
     }
 
     // https://w3c.github.io/ServiceWorker/#navigation-preload-manager-getstate
-    fn GetState(&self) -> Rc<Promise> {
-        let in_compartment_proof = AlreadyInCompartment::assert(&*self.global());
-        let promise = Promise::new_in_current_compartment(
-            &*self.global(),
-            InCompartment::Already(&in_compartment_proof),
-        );
+    fn GetState(&self, comp: InCompartment) -> Rc<Promise> {
+        let promise = Promise::new_in_current_compartment(&*self.global(), comp);
         // 2.
         let mut state = NavigationPreloadState::empty();