Issue #25 - Part 17: Remove XREChildData

5 files changed, 3 insertions, 58 deletions

diff --git a/ipc/contentproc/plugin-container.cpp b/ipc/contentproc/plugin-container.cpp
index 0e59e9d7a..a12b9bd8b 100644
--- a/ipc/contentproc/plugin-container.cpp
+++ b/ipc/contentproc/plugin-container.cpp
@@ -20,14 +20,6 @@
 #include <unistd.h>
 #endif
 
-#include "GMPLoader.h"
-
-mozilla::gmp::SandboxStarter*
-MakeSandboxStarter()
-{
-    return nullptr;
-}
-
 int
 content_process_main(int argc, char* argv[])
 {
@@ -37,8 +29,6 @@ content_process_main(int argc, char* argv[])
       return 3;
     }
 
-    XREChildData childData;
-
     XRE_SetProcessType(argv[--argc]);
 
 #ifdef XP_WIN
@@ -50,15 +40,7 @@ content_process_main(int argc, char* argv[])
         SetDllDirectoryW(L"");
     }
 #endif
-#ifdef MOZ_PLUGIN_CONTAINER
-    // On desktop, the GMPLoader lives in plugin-container, so that its
-    // code can be covered by an EME/GMP vendor's voucher.
-    nsAutoPtr<mozilla::gmp::SandboxStarter> starter(MakeSandboxStarter());
-    if (XRE_GetProcessType() == GeckoProcessType_GMPlugin) {
-        childData.gmpLoader = mozilla::gmp::CreateGMPLoader(starter);
-    }
-#endif
-    nsresult rv = XRE_InitChildProcess(argc, argv, &childData);
+    nsresult rv = XRE_InitChildProcess(argc, argv);
     NS_ENSURE_SUCCESS(rv, 1);
 
     return 0;
diff --git a/system/runtime/nsEmbedFunctions.cpp b/system/runtime/nsEmbedFunctions.cpp
index 841ea2a2d..02cd1e39d 100644
--- a/system/runtime/nsEmbedFunctions.cpp
+++ b/system/runtime/nsEmbedFunctions.cpp
@@ -232,17 +232,11 @@ SetTaskbarGroupId(const nsString& aId)
 
 nsresult
 XRE_InitChildProcess(int aArgc,
-                     char* aArgv[],
-                     const XREChildData* aChildData)
+                     char* aArgv[])
 {
   NS_ENSURE_ARG_MIN(aArgc, 2);
   NS_ENSURE_ARG_POINTER(aArgv);
   NS_ENSURE_ARG_POINTER(aArgv[0]);
-  MOZ_ASSERT(aChildData);
-
-  // On non-Fennec Gecko, the GMPLoader code resides in plugin-container,
-  // and we must forward it through to the GMP code here.
-  GMPProcessChild::SetGMPLoader(aChildData->gmpLoader.get());
 
 #if defined(XP_WIN)
   // From the --attach-console support in nsNativeAppSupportWin.cpp, but
diff --git a/xpcom/build/XREChildData.h b/xpcom/build/XREChildData.h
deleted file mode 100644
index b4cd9895f..000000000
--- a/xpcom/build/XREChildData.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/. */
-
-#ifndef XREChildData_h
-#define XREChildData_h
-
-#include "mozilla/UniquePtr.h"
-
-namespace mozilla {
-namespace gmp {
-class GMPLoader;
-}
-}
-
-/**
- * Data needed to start a child process.
- */
-struct XREChildData
-{
-  /**
-   * Used to load the GMP binary.
-   */
-  mozilla::UniquePtr<mozilla::gmp::GMPLoader> gmpLoader;
-};
-
-#endif // XREChildData_h
diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build
index 3e0752a85..a18751675 100644
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -9,7 +9,6 @@ EXPORTS += [
     'nsXPCOMCIDInternal.h',
     'nsXREAppData.h',
     'nsXULAppAPI.h',
-    'XREChildData.h',
     'xrecore.h',
 ]
 
diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h
index 18ccca415..1bcae71a7 100644
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -18,7 +18,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Vector.h"
 #include "mozilla/TimeStamp.h"
-#include "XREChildData.h"
 
 /**
  * A directory service key which provides the platform-correct "application
@@ -432,8 +431,7 @@ class GMPLoader;
 
 XRE_API(nsresult,
         XRE_InitChildProcess, (int aArgc,
-                               char* aArgv[],
-                               const XREChildData* aChildData))
+                               char* aArgv[]))
 
 XRE_API(GeckoProcessType,
         XRE_GetProcessType, ())