Bug 1541130: Follow-up: Add more missing parts that had been stripped during rebase; r=froydnj, jld on a CLOSED TREE

--HG--
extra : histedit_source : 32bf8b98e843a2d7bfd87ed4c8bfe6cdcb8a1ced

Author: dblohm7

ipc/glue/GeckoChildProcessHost.cpp

@@ -183,14 +183,11 @@ void GeckoChildProcessHost::Destroy() {
 }
 
 // static
-auto GeckoChildProcessHost::GetPathToBinary(FilePath& exePath,
-                                            GeckoProcessType processType)
-    -> BinaryPathType {
-  if (sRunSelfAsContentProc && (processType == GeckoProcessType_Content ||
-                                processType == GeckoProcessType_GPU ||
-                                processType == GeckoProcessType_VR ||
-                                processType == GeckoProcessType_RDD ||
-                                processType == GeckoProcessType_Socket)) {
+BinPathType GeckoChildProcessHost::GetPathToBinary(FilePath& exePath,
+                                            GeckoProcessType processType) {
+  BinPathType pathType = XRE_GetChildProcBinPathType(processType);
+
+  if (pathType == BinPathType::Self) {
 #if defined(OS_WIN)
     wchar_t exePathBuf[MAXPATHLEN];
     if (!::GetModuleFileNameW(nullptr, exePathBuf, MAXPATHLEN)) {
@@ -213,7 +210,7 @@ auto GeckoChildProcessHost::GetPathToBinary(FilePath& exePath,
 #else
 #  error Sorry; target OS not supported yet.
 #endif
-    return BinaryPathType::Self;
+    return pathType;
   }
 
   if (ShouldHaveDirectoryService()) {
@@ -252,7 +249,7 @@ auto GeckoChildProcessHost::GetPathToBinary(FilePath& exePath,
 
   exePath = exePath.AppendASCII(MOZ_CHILD_PROCESS_NAME);
 
-  return BinaryPathType::PluginContainer;
+  return pathType;
 }
 
 #ifdef MOZ_WIDGET_COCOA
@@ -855,7 +852,7 @@ bool GeckoChildProcessHost::PerformAsyncLaunch(
 #  endif  // defined(OS_POSIX)
 
   FilePath exePath;
-  BinaryPathType pathType = GetPathToBinary(exePath, mProcessType);
+  BinPathType pathType = GetPathToBinary(exePath, mProcessType);
 
   // remap the IPC socket fd to a well-known int, as the OS does for
   // STDOUT_FILENO, for example
@@ -871,7 +868,7 @@ bool GeckoChildProcessHost::PerformAsyncLaunch(
 
   childArgv.push_back(exePath.value());
 
-  if (pathType == BinaryPathType::Self) {
+  if (pathType == BinPathType::Self) {
     childArgv.push_back("-contentproc");
   }
 
@@ -1040,7 +1037,7 @@ bool GeckoChildProcessHost::PerformAsyncLaunch(
 #elif defined(OS_WIN)  // defined(OS_POSIX)
 
   FilePath exePath;
-  BinaryPathType pathType = GetPathToBinary(exePath, mProcessType);
+  BinPathType pathType = GetPathToBinary(exePath, mProcessType);
 
 #  if defined(MOZ_SANDBOX) || defined(_ARM64_)
   const bool isGMP = mProcessType == GeckoProcessType_GMPlugin;
@@ -1061,7 +1058,7 @@ bool GeckoChildProcessHost::PerformAsyncLaunch(
 
   CommandLine cmdLine(exePath.ToWStringHack());
 
-  if (pathType == BinaryPathType::Self) {
+  if (pathType == BinPathType::Self) {
     cmdLine.AppendLooseValue(UTF8ToWide("-contentproc"));
   }
 
@@ -1353,8 +1350,6 @@ void GeckoChildProcessHost::GetQueuedMessages(std::queue<IPC::Message>& queue) {
   // We expect the next listener to take over processing of our queue.
 }
 
-bool GeckoChildProcessHost::sRunSelfAsContentProc(false);
-
 #ifdef MOZ_WIDGET_ANDROID
 void GeckoChildProcessHost::LaunchAndroidService(
     const char* type, const std::vector<std::string>& argv,