Move FilePathWatcher to base/files.

content/browser/plugin_service.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 "content/browser/plugin_service.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 42 matching lines @@
 
 static void PurgePluginListCache(bool reload_pages) {
   for (RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
        !it.IsAtEnd(); it.Advance()) {
     it.GetCurrentValue()->Send(new ViewMsg_PurgePluginListCache(reload_pages));
   }
 }
 
 #if defined(OS_LINUX)
 // Delegate class for monitoring directories.
-class PluginDirWatcherDelegate : public FilePathWatcher::Delegate {
+class PluginDirWatcherDelegate : public base::files::FilePathWatcher::Delegate {
   virtual void OnFilePathChanged(const FilePath& path) OVERRIDE {
     VLOG(1) << "Watched path changed: " << path.value();
     // Make the plugin list update itself
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   }
   virtual void OnFilePathError(const FilePath& path) OVERRIDE {
     // TODO(pastarmovj): Add some sensible error handling. Maybe silently
     // stopping the watcher would be enough. Or possibly restart it.
     NOTREACHED();
   }
@@ skipping 75 matching lines @@
 // important plugins register themselves in the registry so no need to do that.
 #if defined(OS_LINUX)
   file_watcher_delegate_ = new PluginDirWatcherDelegate();
   // Get the list of all paths for registering the FilePathWatchers
   // that will track and if needed reload the list of plugins on runtime.
   std::vector<FilePath> plugin_dirs;
   webkit::npapi::PluginList::Singleton()->GetPluginDirectories(
       &plugin_dirs);
 
   for (size_t i = 0; i < plugin_dirs.size(); ++i) {
-    FilePathWatcher* watcher = new FilePathWatcher();
+    base::files::FilePathWatcher* watcher = new base::files::FilePathWatcher();

[dmac, 2011/04/05 19:55:51]

just realized that this should go under the #if defined(OS_WIN) below because it
will leak in the case where plugin_dirs[i] is not absolute.

[Craig, 2011/04/06 15:27:30]

Done.

     // FilePathWatcher can not handle non-absolute paths under windows.
     // We don't watch for file changes in windows now but if this should ever
     // be extended to Windows these lines might save some time of debugging.
 #if defined(OS_WIN)
     if (!plugin_dirs[i].IsAbsolute())
       continue;
 #endif
     VLOG(1) << "Watching for changes in: " << plugin_dirs[i].value();
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
@@ skipping 369 matching lines @@
     }
     info.enabled = enabled_state;
 
     webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
   }
 }
 
 #if defined(OS_LINUX)
 // static
 void PluginService::RegisterFilePathWatcher(
-    FilePathWatcher *watcher,
+    base::files::FilePathWatcher *watcher,
     const FilePath& path,
-    FilePathWatcher::Delegate* delegate) {
+    base::files::FilePathWatcher::Delegate* delegate) {
   bool result = watcher->Watch(path, delegate);
   DCHECK(result);
 }
 #endif