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

chrome/service/service_process.h

 // 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.
 
 #ifndef CHROME_SERVICE_SERVICE_PROCESS_H_
 #define CHROME_SERVICE_SERVICE_PROCESS_H_
 #pragma once
 
 #include <string>
 
@@ skipping 11 matching lines @@
 class ServiceProcessState;
 
 namespace net {
 class NetworkChangeNotifier;
 }
 
 class CommandLine;
 
 // The ServiceProcess does not inherit from ChildProcess because this
 // process can live independently of the browser process.
+// ServiceProcess Design Notes
+// https://sites.google.com/a/chromium.org/dev/developers/design-documents/service-processes
 class ServiceProcess : public CloudPrintProxy::Client {
  public:
   ServiceProcess();
   virtual ~ServiceProcess();
 
   // Initialize the ServiceProcess with the message loop that it should run on.
   // ServiceProcess takes ownership of |state|.
   bool Initialize(MessageLoopForUI* message_loop,
                   const CommandLine& command_line,
                   ServiceProcessState* state);
@@ skipping 50 matching lines @@
 
   // CloudPrintProxy::Client implementation.
   virtual void OnCloudPrintProxyEnabled(bool persist_state);
   virtual void OnCloudPrintProxyDisabled(bool persist_state);
 
   ServiceURLRequestContextGetter* GetServiceURLRequestContextGetter();
 
  private:
   // Schedule a call to ShutdownIfNeeded.
   void ScheduleShutdownCheck();
+
   // Shuts down the process if no services are enabled and no clients are
   // connected.
   void ShutdownIfNeeded();
+
   // Called exactly ONCE per process instance for each service that gets
   // enabled in this process.
   void OnServiceEnabled();
+
   // Called exactly ONCE per process instance for each service that gets
   // disabled in this process (note that shutdown != disabled).
   void OnServiceDisabled();
 
+  // Terminate forces the service process to quit.
+  void Terminate();
+
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<base::Thread> io_thread_;
   scoped_ptr<base::Thread> file_thread_;
   scoped_ptr<CloudPrintProxy> cloud_print_proxy_;
   scoped_ptr<ServiceProcessPrefs> service_prefs_;
   scoped_ptr<ServiceIPCServer> ipc_server_;
   scoped_ptr<ServiceProcessState> service_process_state_;
 
   // An event that will be signalled when we shutdown.
   base::WaitableEvent shutdown_event_;
@@ skipping 12 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ServiceProcess);
 };
 
 // Disable refcounting for runnable method because it is really not needed
 // when we post tasks on the main message loop.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcess);
 
 extern ServiceProcess* g_service_process;
 
 #endif  // CHROME_SERVICE_SERVICE_PROCESS_H_