Patch for bug 74983 (among others) to be applied to M11 696 branch.

chrome/common/service_process_util_posix.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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_posix.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop_proxy.h"
 
 namespace {
 int g_signal_socket = -1;
@@ skipping 36 matching lines @@
   //                 down by an appropriate process.
   int message = ServiceProcessShutdownMonitor::kShutDownMessage;
   if (write(g_signal_socket, &message, sizeof(message)) < 0) {
     PLOG(ERROR) << "write";
   }
 }
 
 ServiceProcessState::StateData::StateData() {}
 
 void ServiceProcessState::StateData::SignalReady() {
+  CHECK_EQ(g_signal_socket, -1);
   CHECK(MessageLoopForIO::current()->WatchFileDescriptor(
       sockets_[0], true, MessageLoopForIO::WATCH_READ,
       &watcher_, shut_down_monitor_.get()));
   g_signal_socket = sockets_[1];
 
   // Set up signal handler for SIGTERM.
   struct sigaction action;
   action.sa_sigaction = SigTermHandler;
   sigemptyset(&action.sa_mask);
   action.sa_flags = SA_SIGINFO;
@@ skipping 19 matching lines @@
   state_->AddRef();
   state_->sockets_[0] = -1;
   state_->sockets_[1] = -1;
   state_->set_action_ = false;
   return true;
 }
 
 bool ServiceProcessState::SignalReady(
     base::MessageLoopProxy* message_loop_proxy, Task* shutdown_task) {
   CHECK(state_);
-  CHECK_EQ(g_signal_socket, -1);
-
+  scoped_ptr<Task> scoped_shutdown_task(shutdown_task);
 #if defined(OS_LINUX)
   state_->running_lock_.reset(TakeServiceRunningLock(true));
   if (state_->running_lock_.get() == NULL) {
     return false;
   }
 #endif // OS_LINUX
   state_->shut_down_monitor_.reset(
-      new ServiceProcessShutdownMonitor(shutdown_task));
+      new ServiceProcessShutdownMonitor(scoped_shutdown_task.release()));
   if (pipe(state_->sockets_) < 0) {
     PLOG(ERROR) << "pipe";
     return false;
   }
+#if defined(OS_MACOSX)
+  state_->state_ = this;
+  message_loop_proxy->PostTask(FROM_HERE,
+      NewRunnableMethod(state_,
+                        &ServiceProcessState::StateData::WatchExecutable));
+#endif  // OS_MACOSX
   message_loop_proxy->PostTask(FROM_HERE,
       NewRunnableMethod(state_, &ServiceProcessState::StateData::SignalReady));
   return true;
 }
 
 void ServiceProcessState::TearDownState() {
-  g_signal_socket = -1;
   if (state_) {
     if (state_->sockets_[0] != -1) {
       close(state_->sockets_[0]);
     }
     if (state_->sockets_[1] != -1) {
       close(state_->sockets_[1]);
     }
     if (state_->set_action_) {
       if (sigaction(SIGTERM, &state_->old_action_, NULL) < 0) {
         PLOG(ERROR) << "sigaction";
       }
     }
+    g_signal_socket = -1;
     state_->Release();
     state_ = NULL;
   }
 }