Getting service process on Mac to handle having things moved/changed underneath it.

chrome/common/service_process_util_win.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 "chrome/common/service_process_util.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 110 matching lines @@
     return false;
   DCHECK(service_process_ready_event.IsValid());
   state_->ready_event.Set(service_process_ready_event.Take());
   return true;
 }
 
 bool ServiceProcessState::SignalReady(
     base::MessageLoopProxy* message_loop_proxy, Task* shutdown_task) {
   DCHECK(state_);
   DCHECK(state_->ready_event.IsValid());
+  scoped_ptr<Task> scoped_shutdown_task(shutdown_task);
   if (!SetEvent(state_->ready_event.Get())) {
     return false;
   }
   if (shutdown_task) {
     state_->shutdown_monitor.reset(
-        new ServiceProcessShutdownMonitor(shutdown_task));
+        new ServiceProcessShutdownMonitor(scoped_shutdown_task.release()));
     state_->shutdown_monitor->Start();
   }
   return true;
 }
 
 bool ServiceProcessState::AddToAutoRun() {
   DCHECK(autorun_command_line_.get());
   // Remove the old autorun value first because we changed the naming scheme
   // for the autorun value name.
   base::win::RemoveCommandFromAutoRun(
@@ skipping 10 matching lines @@
   base::win::RemoveCommandFromAutoRun(
       HKEY_CURRENT_USER, UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
   return base::win::RemoveCommandFromAutoRun(
       HKEY_CURRENT_USER, UTF8ToWide(GetServiceProcessAutoRunKey()));
 }
 
 void ServiceProcessState::TearDownState() {
   delete state_;
   state_ = NULL;
 }