Revert 40744 - Terminate NaCl broker process when no loader processes are running

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/669019

TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/668165

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

2 files changed, 1 insertions, 9 deletions

diff --git a/chrome/nacl/broker_thread.cc b/chrome/nacl/broker_thread.cc
index f94d49d..832c73a7 100644
--- a/chrome/nacl/broker_thread.cc
+++ b/chrome/nacl/broker_thread.cc
@@ -8,11 +8,10 @@
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "chrome/common/child_process.h"
+#include "chrome/common/sandbox_policy.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_messages.h"
-#include "chrome/common/sandbox_policy.h"
 #include "ipc/ipc_switches.h"
 
 NaClBrokerThread::NaClBrokerThread()
@@ -32,7 +31,6 @@ void NaClBrokerThread::OnControlMessageReceived(const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(NaClBrokerThread, msg)
     IPC_MESSAGE_HANDLER(NaClProcessMsg_LaunchLoaderThroughBroker,
                         OnLaunchLoaderThroughBroker)
-    IPC_MESSAGE_HANDLER(NaClProcessMsg_StopBroker, OnStopBroker)
   IPC_END_MESSAGE_MAP()
 }
 
@@ -66,14 +64,9 @@ void NaClBrokerThread::OnLaunchLoaderThroughBroker(
                                          loader_handle_in_browser));
 }
 
-void NaClBrokerThread::OnStopBroker() {
-  ChildProcess::current()->ReleaseProcess();
-}
-
 void NaClBrokerThread::OnChannelConnected(int32 peer_pid) {
   bool res = base::OpenProcessHandle(peer_pid, &browser_handle_);
   DCHECK(res);
-  ChildProcess::current()->AddRefProcess();
   Send(new NaClProcessMsg_BrokerReady());
 }
 
diff --git a/chrome/nacl/broker_thread.h b/chrome/nacl/broker_thread.h
index fb4cf40..d88919f 100644
--- a/chrome/nacl/broker_thread.h
+++ b/chrome/nacl/broker_thread.h
@@ -27,7 +27,6 @@ class NaClBrokerThread : public ChildThread {
   virtual void OnControlMessageReceived(const IPC::Message& msg);
   void OnLaunchLoaderThroughBroker(const std::wstring& loader_channel_id);
   void OnShareBrowserHandle(int browser_handle);
-  void OnStopBroker();
 
   base::ProcessHandle browser_handle_;
   sandbox::BrokerServices* broker_services_;