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

chrome/browser/nacl_host/nacl_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 "build/build_config.h"
 
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
@@ skipping 131 matching lines @@
       LOG(ERROR) << "nacl::Close() failed";
     }
   }
 
   if (reply_msg_) {
     // The process failed to launch for some reason.
     // Don't keep the renderer hanging.
     reply_msg_->set_reply_error();
     chrome_render_message_filter_->Send(reply_msg_);
   }
+
+#if defined(OS_WIN)
+  NaClBrokerService::GetInstance()->OnLoaderDied();
+#endif
 }
 
 // Attempt to ensure the IRT will be available when we need it, but don't wait.
 bool NaClBrowser::EnsureIrtAvailable() {
   if (IrtAvailable())
     return true;
 
   return BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&NaClBrowser::DoOpenIrtLibraryFile));
@@ skipping 124 matching lines @@
 #endif
 
   return true;
 }
 
 void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) {
   set_handle(handle);
   OnProcessLaunched();
 }
 
-base::TerminationStatus NaClProcessHost::GetChildTerminationStatus(
-    int* exit_code) {
-  if (RunningOnWOW64())
-    return base::GetTerminationStatus(handle(), exit_code);
-  return BrowserChildProcessHost::GetChildTerminationStatus(exit_code);
+void NaClProcessHost::OnProcessCrashed(int exit_code) {
+  std::string message = base::StringPrintf(
+      "NaCl process exited with status %i (0x%x)", exit_code, exit_code);
+  LOG(ERROR) << message;
 }
 
 // This only ever runs on the BrowserThread::FILE thread.
 // If multiple tasks are posted, the later ones are no-ops.
 void NaClBrowser::OpenIrtLibraryFile() {
   if (irt_platform_file_ != base::kInvalidPlatformFileValue)
     // We've already run.
     return;
 
   FilePath irt_filepath;
@@ skipping 201 matching lines @@
 #endif
 
   Send(new NaClProcessMsg_Start(handles_for_sel_ldr));
   internal_->sockets_for_sel_ldr.clear();
 }
 
 bool NaClProcessHost::OnMessageReceived(const IPC::Message& msg) {
   NOTREACHED() << "Invalid message with type = " << msg.type();
   return false;
 }