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

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 42b0a31564ce802213d01781fb7e23e7ea759eaf..833574935912ee612e1488f62ecb96e83053da51 100644
--- a/chrome/common/service_process_util_posix.h
+++ b/chrome/common/service_process_util_posix.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -21,6 +21,8 @@ MultiProcessLock* TakeServiceRunningLock(bool waiting);
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_cftyperef.h"
+#include "content/common/file_path_watcher/file_path_watcher.h"
+
 class CommandLine;
 CFDictionaryRef CreateServiceProcessLaunchdPlist(CommandLine* cmd_line,
                                                  bool for_auto_launch);
@@ -57,7 +59,11 @@ struct ServiceProcessState::StateData
   void SignalReady();
 
 #if defined(OS_MACOSX)
+  void WatchExecutable();
+
   base::mac::ScopedCFTypeRef<CFDictionaryRef> launchd_conf_;
+  FilePathWatcher executable_watcher_;
+  ServiceProcessState* state_;
 #endif  // OS_MACOSX
 #if defined(OS_LINUX)
   scoped_ptr<MultiProcessLock> initializing_lock_;