Back out bug 1050122 for causing silent timeouts on emulator mochitests. a=me

This commit is contained in:
Kyle Huey
2014-09-02 12:05:36 -07:00
parent 5ccfcc9daf
commit 0fc9f8731a
3 changed files with 2 additions and 16 deletions

View File

@@ -28,7 +28,6 @@
#include "mozilla/BackgroundHangMonitor.h"
#include "mozilla/DebugOnly.h"
#include "base/process_util.h"
#include "mozilla/Preferences.h"
#include "prenv.h"
@@ -191,14 +190,6 @@ ProcLoaderClientGeckoInit()
MOZ_ASSERT(!sProcLoaderClientGeckoInitialized,
"call ProcLoaderClientGeckoInit() more than once");
if (!Preferences::GetBool("dom.ipc.processPrelaunch.enabled", false)) {
kill(sProcLoaderPid, SIGKILL);
sProcLoaderPid = 0;
close(sProcLoaderChannelFd);
sProcLoaderChannelFd = -1;
return;
}
sProcLoaderClientGeckoInitialized = true;
FileDescriptor *fd = new FileDescriptor(sProcLoaderChannelFd);