Move FilePathWatcher to base/files.

content/browser/plugin_service.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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_
 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_
 #pragma once
@@ skipping 15 matching lines @@
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel_handle.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
 
 #if defined(OS_WIN)
 #include "base/memory/scoped_ptr.h"
 #include "base/win/registry.h"
 #endif
 
 #if defined(OS_LINUX)
-#include "content/common/file_path_watcher/file_path_watcher.h"
+#include "base/files/file_path_watcher.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 namespace chromeos {
 class PluginSelectionPolicy;
 }
 #endif
 
 namespace IPC {
 class Message;
@@ skipping 115 matching lines @@
 
   // Helper so we can finish opening the channel after looking up the
   // plugin.
   void FinishOpenChannelToPlugin(
       const FilePath& plugin_path,
       PluginProcessHost::Client* client);
 
 #if defined(OS_LINUX)
   // Registers a new FilePathWatcher for a given path.
   static void RegisterFilePathWatcher(
-      FilePathWatcher* watcher,
+      base::files::FilePathWatcher* watcher,
       const FilePath& path,
-      FilePathWatcher::Delegate* delegate);
+      base::files::FilePathWatcher::Delegate* delegate);
 #endif
 
   // The main thread's message loop.
   MessageLoop* main_message_loop_;
 
   // The browser's UI locale.
   const std::string ui_locale_;
 
   // Map of plugin paths to the origin they are restricted to.
   base::Lock restricted_plugin_lock_;  // Guards access to restricted_plugin_.
@@ skipping 10 matching lines @@
   // Registry keys for getting notifications when new plugins are installed.
   base::win::RegKey hkcu_key_;
   base::win::RegKey hklm_key_;
   scoped_ptr<base::WaitableEvent> hkcu_event_;
   scoped_ptr<base::WaitableEvent> hklm_event_;
   base::WaitableEventWatcher hkcu_watcher_;
   base::WaitableEventWatcher hklm_watcher_;
 #endif
 
 #if defined(OS_LINUX)
-  ScopedVector<FilePathWatcher> file_watchers_;
+  ScopedVector<base::files::FilePathWatcher> file_watchers_;
   scoped_refptr<PluginDirWatcherDelegate> file_watcher_delegate_;
 #endif
 
   std::vector<PepperPluginInfo> ppapi_plugins_;
 
   std::vector<OverriddenPlugin> overridden_plugins_;
   base::Lock overridden_plugins_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginService);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_H_