Move FilePathWatcher to base/files.

chrome/common/service_process_util_posix.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_COMMON_SERVICE_PROCESS_UTIL_POSIX_H_
 #define CHROME_COMMON_SERVICE_PROCESS_UTIL_POSIX_H_
 
 #include "service_process_util.h"
 
 #include <signal.h>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_pump_libevent.h"
 
 #if defined(OS_LINUX)
 #include "chrome/common/multi_process_lock.h"
 MultiProcessLock* TakeServiceRunningLock(bool waiting);
 #endif  // OS_LINUX
 
 #if defined(OS_MACOSX)
+#include "base/files/file_path_watcher.h"
 #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);
 #endif  // OS_MACOSX
 
 namespace base {
 class WaitableEvent;
 }
 
@@ skipping 28 matching lines @@
   void SignalReady(base::WaitableEvent* signal, bool* success);
 
 
   // TODO(jhawkins): Either make this a class or rename these public member
   // variables to remove the trailing underscore.
 
 #if defined(OS_MACOSX)
   bool WatchExecutable();
 
   base::mac::ScopedCFTypeRef<CFDictionaryRef> launchd_conf_;
-  FilePathWatcher executable_watcher_;
+  base::files::FilePathWatcher executable_watcher_;
 #endif  // OS_MACOSX
 #if defined(OS_LINUX)
   scoped_ptr<MultiProcessLock> initializing_lock_;
   scoped_ptr<MultiProcessLock> running_lock_;
 #endif  // OS_LINUX
   scoped_ptr<ServiceProcessShutdownMonitor> shut_down_monitor_;
   base::MessagePumpLibevent::FileDescriptorWatcher watcher_;
   int sockets_[2];
   struct sigaction old_action_;
   bool set_action_;
 
  protected:
   friend class base::RefCountedThreadSafe<ServiceProcessState::StateData>;
   virtual ~StateData();
 };
 
 #endif  // CHROME_COMMON_SERVICE_PROCESS_UTIL_POSIX_H_