Simplify BrowserChildProcessHost in preparation for refactoring it so that consumers embed it in ...

content/browser/browser_child_process_host.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.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
@@ skipping 113 matching lines @@
 
 void BrowserChildProcessHost::Notify(int type) {
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&ChildNotificationHelper, type, data_));
 }
 
 base::TerminationStatus BrowserChildProcessHost::GetChildTerminationStatus(
     int* exit_code) {
+  if (!child_process_.get())  // If the delegate doesn't use Launch() helper.
+    return base::GetTerminationStatus(handle(), exit_code);
   return child_process_->GetChildTerminationStatus(exit_code);
 }
 
 bool BrowserChildProcessHost::OnMessageReceived(const IPC::Message& message) {
   return false;
 }
 
 void BrowserChildProcessHost::OnChannelConnected(int32 peer_pid) {
   Notify(content::NOTIFICATION_CHILD_PROCESS_HOST_CONNECTED);
 }
@@ skipping 23 matching lines @@
                                 this->type(),
                                 content::PROCESS_TYPE_MAX);
       if (disconnect_was_alive_) {
         UMA_HISTOGRAM_ENUMERATION("ChildProcess.CrashedWasAlive",
                                   this->type(),
                                   content::PROCESS_TYPE_MAX);
       }
       break;
     }
     case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: {
-      OnProcessWasKilled(exit_code);
       // Report that this child process was killed.
-      Notify(content::NOTIFICATION_CHILD_PROCESS_WAS_KILLED);
       UMA_HISTOGRAM_ENUMERATION("ChildProcess.Killed",
                                 this->type(),
                                 content::PROCESS_TYPE_MAX);
       if (disconnect_was_alive_) {
         UMA_HISTOGRAM_ENUMERATION("ChildProcess.KilledWasAlive",
                                   this->type(),
                                   content::PROCESS_TYPE_MAX);
       }
       break;
     }
@@ skipping 103 matching lines @@
 
     return *iterator_;
   } while (true);
 
   return NULL;
 }
 
 bool BrowserChildProcessHost::Iterator::Done() {
   return iterator_ == g_child_process_list.Get().end();
 }