Fix race condition in utility process clients

content/browser/browser_child_process_host_impl.cc

 // Copyright (c) 2011 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 "content/browser/browser_child_process_host_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
@@ skipping 197 matching lines @@
 // delayed task to wait for an exit code. However, this means that this method
 // may be called twice: once from the actual channel error and once from
 // OnWaitableEventSignaled() or the delayed task.
 void BrowserChildProcessHostImpl::OnChildDisconnected() {
   DCHECK(data_.handle != base::kNullProcessHandle);
   int exit_code;
   base::TerminationStatus status = GetTerminationStatus(&exit_code);
   switch (status) {
     case base::TERMINATION_STATUS_PROCESS_CRASHED:
     case base::TERMINATION_STATUS_ABNORMAL_TERMINATION: {
-      delegate_->OnProcessCrashed(exit_code);
+      delegate_->OnProcessCrashedOrWasKilled(exit_code);
       // Report that this child process crashed.
       Notify(content::NOTIFICATION_CHILD_PROCESS_CRASHED);
       UMA_HISTOGRAM_ENUMERATION("ChildProcess.Crashed",
                                 data_.type,
                                 content::PROCESS_TYPE_MAX);
       if (disconnect_was_alive_) {
         UMA_HISTOGRAM_ENUMERATION("ChildProcess.CrashedWasAlive",
                                   data_.type,
                                   content::PROCESS_TYPE_MAX);
       }
       break;
     }
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: {
+      delegate_->OnProcessCrashedOrWasKilled(exit_code);

[jam, 2012/01/26 03:56:18]

it seems that consumers don't care if it crashed because it crashes or was
killed. so why not just leave it as OnProcessCrashed here?

[dgrogan, 2012/01/26 04:17:39]

I didn't want to blur the line between crashed and killed that is made here. But
you're right, that distinction doesn't matter to the consumers and keeping the
name makes this change smaller, so: changed back to OnProcessCrashed.

       // Report that this child process was killed.
       UMA_HISTOGRAM_ENUMERATION("ChildProcess.Killed",
                                 data_.type,
                                 content::PROCESS_TYPE_MAX);
       if (disconnect_was_alive_) {
         UMA_HISTOGRAM_ENUMERATION("ChildProcess.KilledWasAlive",
                                   data_.type,
                                   content::PROCESS_TYPE_MAX);
       }
       break;
@@ skipping 67 matching lines @@
 
 
 void BrowserChildProcessHostImpl::OnProcessLaunched() {
   if (!child_process_->GetHandle()) {
     delete delegate_;  // Will delete us
     return;
   }
   data_.handle = child_process_->GetHandle();
   delegate_->OnProcessLaunched();
 }