Adding upstream version 125.0.1.upstream/125.0.1

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

4 files changed, 0 insertions, 34 deletions

diff --git a/js/xpconnect/tests/components/native/moz.build b/js/xpconnect/tests/components/native/moz.build
index ba3d227c5b..662cfbcc85 100644
--- a/js/xpconnect/tests/components/native/moz.build
+++ b/js/xpconnect/tests/components/native/moz.build
@@ -14,7 +14,6 @@ UNIFIED_SOURCES += [
     "xpctest_esmreturncode.cpp",
     "xpctest_module.cpp",
     "xpctest_params.cpp",
-    "xpctest_returncode.cpp",
 ]
 
 LOCAL_INCLUDES += [
diff --git a/js/xpconnect/tests/components/native/xpctest_module.cpp b/js/xpconnect/tests/components/native/xpctest_module.cpp
index 42b4259d5b..11200240b1 100644
--- a/js/xpconnect/tests/components/native/xpctest_module.cpp
+++ b/js/xpconnect/tests/components/native/xpctest_module.cpp
@@ -35,8 +35,6 @@ nsresult xpcTestRegisterComponents() {
       "@mozilla.org/js/xpc/test/native/ObjectReadWrite;1"));
   MOZ_TRY(RegisterFactory<nsXPCTestParams>(
       "@mozilla.org/js/xpc/test/native/Params;1"));
-  MOZ_TRY(RegisterFactory<nsXPCTestReturnCodeParent>(
-      "@mozilla.org/js/xpc/test/native/ReturnCodeParent;1"));
   MOZ_TRY(RegisterFactory<nsXPCTestESMReturnCodeParent>(
       "@mozilla.org/js/xpc/test/native/ESMReturnCodeParent;1"));
   MOZ_TRY(RegisterFactory<xpcTestCEnums>(
diff --git a/js/xpconnect/tests/components/native/xpctest_private.h b/js/xpconnect/tests/components/native/xpctest_private.h
index c5d7bc86cf..d2d12d4ef8 100644
--- a/js/xpconnect/tests/components/native/xpctest_private.h
+++ b/js/xpconnect/tests/components/native/xpctest_private.h
@@ -67,17 +67,6 @@ class nsXPCTestParams final : public nsIXPCTestParams {
   ~nsXPCTestParams() = default;
 };
 
-class nsXPCTestReturnCodeParent final : public nsIXPCTestReturnCodeParent {
- public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIXPCTESTRETURNCODEPARENT
-
-  nsXPCTestReturnCodeParent() = default;
-
- private:
-  ~nsXPCTestReturnCodeParent() = default;
-};
-
 class nsXPCTestESMReturnCodeParent final : public nsIXPCTestReturnCodeParent {
  public:
   NS_DECL_ISUPPORTS
diff --git a/js/xpconnect/tests/components/native/xpctest_returncode.cpp b/js/xpconnect/tests/components/native/xpctest_returncode.cpp
deleted file mode 100644
index 3a52f616d9..0000000000
--- a/js/xpconnect/tests/components/native/xpctest_returncode.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "xpctest_private.h"
-#include "nsComponentManagerUtils.h"
-#include "nsImportModule.h"
-
-NS_IMPL_ISUPPORTS(nsXPCTestReturnCodeParent, nsIXPCTestReturnCodeParent)
-
-NS_IMETHODIMP nsXPCTestReturnCodeParent::CallChild(int32_t childBehavior,
-                                                   nsresult* _retval) {
-  nsresult rv;
-  nsCOMPtr<nsIXPCTestReturnCodeChild> child(do_ImportModule(
-      "resource://test/ReturnCodeChild.jsm", "ReturnCodeChild", &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = child->DoIt(childBehavior);
-  *_retval = rv;
-  return NS_OK;
-}