Make sure that the NaCl 64 bit broker process doesn't hang around if the browser process quits unexpectedly. Previously this was done through ChildThread, but we don't use that anymore.

TEST=kill browser process while broker is running and see that all nacl64.exe processes are gone
Review URL: http://codereview.chromium.org/7877010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100820 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 0 deletions

diff --git a/chrome/nacl/nacl_broker_listener.cc b/chrome/nacl/nacl_broker_listener.cc
index cf2b8a0..75864c8 100644
--- a/chrome/nacl/nacl_broker_listener.cc
+++ b/chrome/nacl/nacl_broker_listener.cc
@@ -49,6 +49,11 @@ bool NaClBrokerListener::OnMessageReceived(const IPC::Message& msg) {
   return handled;
 }
 
+void NaClBrokerListener::OnChannelError() {
+  // The browser died unexpectedly, quit to avoid a zombie process.
+  MessageLoop::current()->Quit();
+}
+
 void NaClBrokerListener::OnLaunchLoaderThroughBroker(
     const std::wstring& loader_channel_id) {
   base::ProcessHandle loader_process = 0;
diff --git a/chrome/nacl/nacl_broker_listener.h b/chrome/nacl/nacl_broker_listener.h
index 1581c6d..e6003d4 100644
--- a/chrome/nacl/nacl_broker_listener.h
+++ b/chrome/nacl/nacl_broker_listener.h
@@ -23,6 +23,7 @@ class NaClBrokerListener : public IPC::Channel::Listener {
   // IPC::Channel::Listener implementation.
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual void OnChannelError() OVERRIDE;
 
  private:
   void OnLaunchLoaderThroughBroker(const std::wstring& loader_channel_id);