From ddbf41fc699f9d305f07b28cd185a22c7fb57fcb Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Tue, 26 Jan 2010 20:09:04 -0600
Subject: [PATCH] Backout 8d0ad9632fd2

---
 dom/plugins/PluginModuleChild.cpp             |  9 ------
 ipc/chromium/src/base/process_util_linux.cc   |  6 ----
 .../common/process_watcher_posix_sigchld.cc   | 31 +------------------
 toolkit/xre/nsAppRunner.cpp                   | 13 --------
 toolkit/xre/nsEmbedFunctions.cpp              | 16 ----------
 5 files changed, 1 insertion(+), 74 deletions(-)

diff --git a/dom/plugins/PluginModuleChild.cpp b/dom/plugins/PluginModuleChild.cpp
index 2572ccde1383..2dfb5787a695 100644
--- a/dom/plugins/PluginModuleChild.cpp
+++ b/dom/plugins/PluginModuleChild.cpp
@@ -281,15 +281,6 @@ PluginModuleChild::ActorDestroy(ActorDestroyReason why)
 {
     // doesn't matter why we're being destroyed; it's up to us to
     // initiate (clean) shutdown
-
-
-
-#ifdef OS_LINUX
-    fprintf(stderr, "TEST-UNEXPECTED-FAIL | plugin process %d | initiating shutdown\n", getpid());
-#endif
-
-
-
     XRE_ShutdownChildProcess();
 }
 
diff --git a/ipc/chromium/src/base/process_util_linux.cc b/ipc/chromium/src/base/process_util_linux.cc
index 4b17ab858124..3a567af1279a 100644
--- a/ipc/chromium/src/base/process_util_linux.cc
+++ b/ipc/chromium/src/base/process_util_linux.cc
@@ -62,12 +62,6 @@ bool LaunchApp(const std::vector<std::string>& argv,
 #endif
     exit(127);
   } else {
-
-
-      fprintf(stderr, "TEST-UNEXPECTED-FAIL | ==> process %d launched | child process %d\n", GetCurrentProcId(), pid);
-
-
-
     gProcessLog.print("==> process %d launched child process %d\n",
                       GetCurrentProcId(), pid);
     if (wait)
diff --git a/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc b/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc
index 1f102aeabb39..624be5b89dc8 100644
--- a/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc
+++ b/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc
@@ -54,12 +54,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-
-
-#include <stdio.h>
-
-
-
 #include "base/eintr_wrapper.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
@@ -195,14 +189,6 @@ public:
     ChildReaper::OnSignal(sig);
 
     if (!process_) {
-
-
-
-      fprintf(stderr, "TEST-UNEXPECTED-FAIL | process %d reaped | child process (got SIGCHLD, exited normally)\n", getpid());
-
-
-
-
       MessageLoop::current()->RemoveDestructionObserver(this);
       delete this;
     }
@@ -214,13 +200,6 @@ public:
     DCHECK(process_);
 
     WaitForChildExit();
-
-
-
-    fprintf(stderr, "TEST-UNEXPECTED-FAIL | process %d reaped | child process (waitpid() on shutdown)\n", getpid());
-
-
-
     process_ = 0;
 
     // XXX don't think this is necessary, since destruction can only
@@ -260,16 +239,8 @@ ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process,
   DCHECK(process != base::GetCurrentProcId());
   DCHECK(process > 0);
 
-  if (IsProcessDead(process)) {
-
-
-
-    fprintf(stderr, "TEST-UNEXPECTED-FAIL | process %d reaped | child process %d (it was already dead)\n", getpid(), process);
-
-
-
+  if (IsProcessDead(process))
     return;
-  }
 
   MessageLoopForIO* loop = MessageLoopForIO::current();
   if (force) {
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 944a6b5066ac..f2e4875c6ae0 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3592,19 +3592,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 
   XRE_DeinitCommandLine();
 
-
-
-
-
-
-#ifdef OS_LINUX
-  fprintf(stderr, "TEST-UNEXPECTED-FAIL | browser process %d | exiting\n", getpid());
-#endif
-
-
-
-
-
   return NS_FAILED(rv) ? 1 : 0;
 }
 
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index 2997ee3296ef..dce653fe12bc 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -371,13 +371,6 @@ XRE_InitChildProcess(int aArgc,
     sIOMessageLoop = nsnull;
   }
 
-
-#ifdef OS_LINUX
-  fprintf(stderr, "TEST-UNEXPECTED-FAIL | plugin process %d | IO thread joined XPCOM thread, exiting\n", getpid());
-#endif
-
-
-
   NS_LogTerm();
   return XRE_DeinitCommandLine();
 }
@@ -510,15 +503,6 @@ XRE_ShutdownChildProcess()
     NS_ABORT_IF_FALSE(!!ioLoop, "Bad shutdown order");
 
     ioLoop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
-
-
-
-#ifdef OS_LINUX
-    fprintf(stderr, "TEST-UNEXPECTED-FAIL | plugin process %d | posted quit task to IO thread\n", getpid());
-#endif
-
-
-
 }
 
 namespace {