Make the mac service process handling code clean itself up properly as far as launchd is concerned.

chrome/common/service_process_util_posix.h

Index: chrome/common/service_process_util_posix.h
diff --git a/chrome/common/service_process_util_posix.h b/chrome/common/service_process_util_posix.h
index d5ef6dc91b82e54555aa86fb3d09c7cde290c60c..2202d0a621178e4370be7e794ac82c9a8a55a7e5 100644
--- a/chrome/common/service_process_util_posix.h
+++ b/chrome/common/service_process_util_posix.h
@@ -31,26 +31,26 @@ namespace base {
 class WaitableEvent;
 }
 
-// Watches for |kShutDownMessage| to be written to the file descriptor it is
-// watching. When it reads |kShutDownMessage|, it performs |shutdown_task_|.
+// Watches for |kTerminateMessage| to be written to the file descriptor it is
+// watching. When it reads |kTerminateMessage|, it performs |terminate_task_|.
 // Used here to monitor the socket listening to g_signal_socket.
-class ServiceProcessShutdownMonitor
+class ServiceProcessTerminateMonitor
     : public MessageLoopForIO::Watcher {
  public:
 
   enum {
-    kShutDownMessage = 0xdecea5e
+    kTerminateMessage = 0xdecea5e
   };
 
-  explicit ServiceProcessShutdownMonitor(Task* shutdown_task);
-  virtual ~ServiceProcessShutdownMonitor();
+  explicit ServiceProcessTerminateMonitor(Task* terminate_task);
+  virtual ~ServiceProcessTerminateMonitor();
 
   // MessageLoopForIO::Watcher overrides
   virtual void OnFileCanReadWithoutBlocking(int fd);
   virtual void OnFileCanWriteWithoutBlocking(int fd);
 
  private:
-  scoped_ptr<Task> shutdown_task_;
+  scoped_ptr<Task> terminate_task_;
 };
 
 struct ServiceProcessState::StateData
@@ -75,7 +75,7 @@ struct ServiceProcessState::StateData
   scoped_ptr<MultiProcessLock> initializing_lock_;
   scoped_ptr<MultiProcessLock> running_lock_;
 #endif
-  scoped_ptr<ServiceProcessShutdownMonitor> shut_down_monitor_;
+  scoped_ptr<ServiceProcessTerminateMonitor> terminate_monitor_;
   MessageLoopForIO::FileDescriptorWatcher watcher_;
   int sockets_[2];
   struct sigaction old_action_;