3 files changed, 18 insertions, 1 deletions
diff --git a/xpcom/build/XREChildData.h b/xpcom/build/XREChildData.h
index 98a67a8e4..b4cd9895f 100644
--- a/xpcom/build/XREChildData.h
+++ b/xpcom/build/XREChildData.h
@@ -8,6 +8,12 @@
 
 #include "mozilla/UniquePtr.h"
 
+namespace mozilla {
+namespace gmp {
+class GMPLoader;
+}
+}
+
 /**
  * Data needed to start a child process.
  */
@@ -16,6 +22,7 @@ struct XREChildData
   /**
    * Used to load the GMP binary.
    */
+  mozilla::UniquePtr<mozilla::gmp::GMPLoader> gmpLoader;
 };
 
 #endif // XREChildData_h
diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h
index 7efeadf40..18ccca415 100644
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -397,6 +397,8 @@ enum GeckoProcessType
 
   GeckoProcessType_IPDLUnitTest,
 
+  GeckoProcessType_GMPlugin, // Gecko Media Plugin
+
   GeckoProcessType_GPU,      // GPU and compositor process
 
   GeckoProcessType_End,
@@ -408,6 +410,7 @@ static const char* const kGeckoProcessTypeString[] = {
   "plugin",
   "tab",
   "ipdlunittest",
+  "geckomediaplugin",
   "gpu"
 };
 
@@ -421,6 +424,12 @@ XRE_API(const char*,
 XRE_API(void,
         XRE_SetProcessType, (const char* aProcessTypeString))
 
+namespace mozilla {
+namespace gmp {
+class GMPLoader;
+} // namespace gmp
+} // namespace mozilla
+
 XRE_API(nsresult,
         XRE_InitChildProcess, (int aArgc,
                                char* aArgv[],
diff --git a/xpcom/system/nsIXULRuntime.idl b/xpcom/system/nsIXULRuntime.idl
index a9f249ee7..fd92cf54a 100644
--- a/xpcom/system/nsIXULRuntime.idl
+++ b/xpcom/system/nsIXULRuntime.idl
@@ -73,7 +73,8 @@ interface nsIXULRuntime : nsISupports
   const unsigned long PROCESS_TYPE_PLUGIN = 1;
   const unsigned long PROCESS_TYPE_CONTENT = 2;
   const unsigned long PROCESS_TYPE_IPDLUNITTEST = 3;
-  const unsigned long PROCESS_TYPE_GPU = 4;
+  const unsigned long PROCESS_TYPE_GMPLUGIN = 4;
+  const unsigned long PROCESS_TYPE_GPU = 5;
 
   /**
    * The type of the caller's process.  Returns one of the values above.