Linux: refactor zygote support

chrome/common/process_watcher_posix.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/process_watcher.h"
 
 #include <errno.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include "base/eintr_wrapper.h"
 #include "base/platform_thread.h"
-#include "base/zygote_manager.h"
 
 // Return true if the given child is dead. This will also reap the process.
 // Doesn't block.
 static bool IsChildDead(pid_t child) {
   const int result = HANDLE_EINTR(waitpid(child, NULL, WNOHANG));
   if (result == -1) {
     NOTREACHED();
   } else if (result > 0) {
     // The child has died.
     return true;
@@ skipping 38 matching lines @@
 
  private:
   const pid_t child_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundReaper);
 };
 
 // static
 void ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process) {
   // If the child is already dead, then there's nothing to do
-  const int result = HANDLE_EINTR(waitpid(process, NULL, WNOHANG));
-  if (result > 0)
+  if (IsChildDead(process))
     return;
-  if (result == -1) {
-#if defined(OS_LINUX)
-    // If it wasn't our child, maybe it was the zygote manager's child
-    base::ZygoteManager* zm = base::ZygoteManager::Get();
-    if (zm) {
-      zm->EnsureProcessTerminated(process);
-      return;
-    }
-#endif  // defined(OS_LINUX)
-    NOTREACHED();
-  }
 
   BackgroundReaper* reaper = new BackgroundReaper(process);
   PlatformThread::CreateNonJoinable(0, reaper);
 }