2 files changed, 4 insertions, 5 deletions
diff --git a/toolkit/components/extensions/webidl-api/ExtensionEventListener.cpp b/toolkit/components/extensions/webidl-api/ExtensionEventListener.cpp
index 5ad9f2dfd8..3dd4303729 100644
--- a/toolkit/components/extensions/webidl-api/ExtensionEventListener.cpp
+++ b/toolkit/components/extensions/webidl-api/ExtensionEventListener.cpp
@@ -299,7 +299,7 @@ NS_IMETHODIMP ExtensionEventListener::CallListener(
   RefPtr<ExtensionListenerCallWorkerRunnable> runnable =
       new ExtensionListenerCallWorkerRunnable(this, std::move(argsHolder),
                                               aCallOptions, retPromise);
-  runnable->Dispatch();
+  runnable->Dispatch(GetWorkerPrivate());
   retPromise.forget(aPromiseResult);
 
   return NS_OK;
@@ -332,7 +332,6 @@ bool ExtensionListenerCallWorkerRunnable::WorkerRun(
     JSContext* aCx, dom::WorkerPrivate* aWorkerPrivate) {
   MOZ_ASSERT(aWorkerPrivate);
   aWorkerPrivate->AssertIsOnWorkerThread();
-  MOZ_ASSERT(aWorkerPrivate == mWorkerPrivate);
   auto global = mListener->GetGlobalObject();
   if (NS_WARN_IF(!global)) {
     return true;
diff --git a/toolkit/components/extensions/webidl-api/ExtensionEventListener.h b/toolkit/components/extensions/webidl-api/ExtensionEventListener.h
index e986e4f58b..f11d3e7f6b 100644
--- a/toolkit/components/extensions/webidl-api/ExtensionEventListener.h
+++ b/toolkit/components/extensions/webidl-api/ExtensionEventListener.h
@@ -120,7 +120,8 @@ class ExtensionEventListener final : public mozIExtensionEventListener {
 // A WorkerRunnable subclass used to call an ExtensionEventListener
 // in the thread that owns the dom::Function wrapped by the
 // ExtensionEventListener class.
-class ExtensionListenerCallWorkerRunnable final : public dom::WorkerRunnable {
+class ExtensionListenerCallWorkerRunnable final
+    : public dom::WorkerThreadRunnable {
   friend class ExtensionListenerCallPromiseResultHandler;
 
  public:
@@ -133,8 +134,7 @@ class ExtensionListenerCallWorkerRunnable final : public dom::WorkerRunnable {
       UniquePtr<dom::StructuredCloneHolder> aArgsHolder,
       ListenerCallOptions* aCallOptions,
       RefPtr<dom::Promise> aPromiseRetval = nullptr)
-      : WorkerRunnable(aExtensionEventListener->GetWorkerPrivate(),
-                       "ExtensionListenerCallWorkerRunnable", WorkerThread),
+      : WorkerThreadRunnable("ExtensionListenerCallWorkerRunnable"),
         mListener(aExtensionEventListener),
         mArgsHolder(std::move(aArgsHolder)),
         mPromiseResult(std::move(aPromiseRetval)),