Issue %3015 - Part 2: Remove XREChildData.

Since we no longer have to deal with passing arbitrary data structures to
plugins when not dealing with GMP/EME/CDMs (for auth keys and what not),
this is no longer needed.

3 files changed, 1 insertions, 25 deletions

diff --git a/xpcom/build/XREChildData.h b/xpcom/build/XREChildData.h
deleted file mode 100644
index 98a67a8e4..000000000
--- a/xpcom/build/XREChildData.h
+++ /dev/null
@@ -1,21 +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"
-
-/**
- * Data needed to start a child process.
- */
-struct XREChildData
-{
-  /**
-   * Used to load the GMP binary.
-   */
-};
-
-#endif // XREChildData_h
diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build
index b579a3b3d..534fe7dd6 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 7efeadf40..235837182 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
@@ -423,8 +422,7 @@ XRE_API(void,
 
 XRE_API(nsresult,
         XRE_InitChildProcess, (int aArgc,
-                               char* aArgv[],
-                               const XREChildData* aChildData))
+                               char* aArgv[]))
 
 XRE_API(GeckoProcessType,
         XRE_GetProcessType, ())