Remove the code to wait on disconnected child processes to get the exit code. This was done in r101…

content/browser/renderer_host/render_process_host_impl.cc

 // Copyright (c) 2012 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #if defined(OS_WIN)
@@ skipping 98 matching lines @@
 #include "ipc/ipc_switches.h"
 #include "media/base/media_switches.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gl/gl_switches.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_WIN)
-#include "base/synchronization/waitable_event.h"
 #include "content/common/font_cache_dispatcher_win.h"
 #endif
 
 #include "third_party/skia/include/core/SkBitmap.h"
 
 extern bool g_exited_main_message_loop;
 
 static const char* kSiteProcessMapKeyName = "content_site_process_map";
 
 namespace content {
@@ skipping 718 matching lines @@
     return false;  // Render process hasn't started or is probably crashed.
 
   // Test if there's an unload listener.
   // NOTE: It's possible that an onunload listener may be installed
   // while we're shutting down, so there's a small race here.  Given that
   // the window is small, it's unlikely that the web page has much
   // state that will be lost by not calling its unload handlers properly.
   if (!SuddenTerminationAllowed())
     return false;
 
-  // Store the handle before it gets changed.
-  base::ProcessHandle handle = GetHandle();
-  ProcessDied(handle, base::TERMINATION_STATUS_NORMAL_TERMINATION, 0, false);
+  ProcessDied();
   fast_shutdown_started_ = true;
   return true;
 }
 
 void RenderProcessHostImpl::DumpHandles() {
 #if defined(OS_WIN)
   Send(new ChildProcessMsg_DumpHandles());
   return;
 #endif
 
@@ skipping 149 matching lines @@
   Send(new ChildProcessMsg_SetIPCLoggingEnabled(
       IPC::Logging::GetInstance()->Enabled()));
 #endif
 
   tracked_objects::ThreadData::Status status =
       tracked_objects::ThreadData::status();
   Send(new ChildProcessMsg_SetProfilerStatus(status));
 }
 
 void RenderProcessHostImpl::OnChannelError() {
-  if (!channel_.get())
-    return;
-
-  // Store the handle before it gets changed.
-  base::ProcessHandle handle = GetHandle();
-
-  // child_process_launcher_ can be NULL in single process mode or if fast
-  // termination happened.
-  int exit_code = 0;
-  base::TerminationStatus status =
-      child_process_launcher_.get() ?
-      child_process_launcher_->GetChildTerminationStatus(&exit_code) :
-      base::TERMINATION_STATUS_NORMAL_TERMINATION;
-
-#if defined(OS_WIN)
-  if (!run_renderer_in_process()) {
-    if (status == base::TERMINATION_STATUS_STILL_RUNNING) {
-      HANDLE process = child_process_launcher_->GetHandle();
-      child_process_watcher_.StartWatching(
-          new base::WaitableEvent(process), this);
-      return;
-    }
-  }
-#endif
-  ProcessDied(handle, status, exit_code, false);
-}
-
-// Called when the renderer process handle has been signaled.
-void RenderProcessHostImpl::OnWaitableEventSignaled(
-    base::WaitableEvent* waitable_event) {
-#if defined (OS_WIN)
-  base::ProcessHandle handle = GetHandle();
-  int exit_code = 0;
-  base::TerminationStatus status =
-      base::GetTerminationStatus(waitable_event->Release(), &exit_code);
-  delete waitable_event;
-  ProcessDied(handle, status, exit_code, true);
-#endif
+  ProcessDied();
 }
 
 BrowserContext* RenderProcessHostImpl::GetBrowserContext() const {
   return browser_context_;
 }
 
 int RenderProcessHostImpl::GetID() const {
   return id_;
 }
 
@@ skipping 293 matching lines @@
       GetSiteProcessMapForBrowserContext(browser_context);
 
   // TODO(creis): Determine if it's better to allow registration of
   // empty sites or not.  For now, group anything from which we can't parse
   // a site into the same process, when using --process-per-site.
   std::string site = SiteInstanceImpl::GetSiteForURL(browser_context, url)
       .possibly_invalid_spec();
   map->RegisterProcess(site, process);
 }
 
-void RenderProcessHostImpl::ProcessDied(base::ProcessHandle handle,
-                                        base::TerminationStatus status,
-                                        int exit_code,
-                                        bool was_alive) {
+void RenderProcessHostImpl::ProcessDied() {
   // Our child process has died.  If we didn't expect it, it's a crash.
   // In any case, we need to let everyone know it's gone.
   // The OnChannelError notification can fire multiple times due to nested sync
   // calls to a renderer. If we don't have a valid channel here it means we
   // already handled the error.
 
-  RendererClosedDetails details(handle, status, exit_code, was_alive);
+  // child_process_launcher_ can be NULL in single process mode or if fast
+  // termination happened.
+  int exit_code = 0;
+  base::TerminationStatus status =
+      child_process_launcher_.get() ?
+      child_process_launcher_->GetChildTerminationStatus(&exit_code) :
+      base::TERMINATION_STATUS_NORMAL_TERMINATION;
+
+  RendererClosedDetails details(GetHandle(), status, exit_code);
   NotificationService::current()->Notify(
       NOTIFICATION_RENDERER_PROCESS_CLOSED,
       Source<RenderProcessHost>(this),
       Details<RendererClosedDetails>(&details));
 
   child_process_launcher_.reset();
   channel_.reset();
   gpu_message_filter_ = NULL;
 
   IDMap<RenderWidgetHost>::iterator iter(&render_widget_hosts_);
@@ skipping 133 matching lines @@
       int32 route_id,
       int32 gpu_process_host_id) {
   TRACE_EVENT0("renderer_host",
                "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
   RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
                                                  gpu_process_host_id,
                                                  0);
 }
 
 }  // namespace content