Switch to using FilePathWatcher::Callback instead of FilePathWatcher::Delegate.

content/browser/plugin_service_impl.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 51 matching lines @@
 // correct thread.
 void WillLoadPluginsCallback(
     base::SequencedWorkerPool::SequenceToken token) {
   if (LoadPluginListInProcess()) {
     CHECK(BrowserThread::GetBlockingPool()->IsRunningSequenceOnCurrentThread(
         token));
   } else {
     CHECK(false) << "Plugin loading should happen out-of-process.";
   }
 }
-}  // namespace
 
 #if defined(OS_MACOSX)
-static void NotifyPluginsOfActivation() {
+void NotifyPluginsOfActivation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (PluginProcessHostIterator iter; !iter.Done(); ++iter)
     iter->OnAppActivation();
 }
 #endif
+
 #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)
-// Delegate class for monitoring directories.
-class PluginDirWatcherDelegate : public 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();
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&PluginService::PurgePluginListCache,
-                   static_cast<BrowserContext*>(NULL), false));
-  }
-
-  virtual void OnFilePathError(const FilePath& path) OVERRIDE {
+void NotifyPluginDirChanged(const FilePath& path, bool error) {
+  if (error) {
     // TODO(pastarmovj): Add some sensible error handling. Maybe silently
     // stopping the watcher would be enough. Or possibly restart it.
     NOTREACHED();
+    return;
   }
+  VLOG(1) << "Watched path changed: " << path.value();
+  // Make the plugin list update itself
+  webkit::npapi::PluginList::Singleton()->RefreshPlugins();
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&PluginService::PurgePluginListCache,
+                 static_cast<BrowserContext*>(NULL), false));
+}
+#endif
 
- protected:
-  virtual ~PluginDirWatcherDelegate() {}
-};
-#endif
+}  // namespace
 
 // static
 PluginService* PluginService::GetInstance() {
   return PluginServiceImpl::GetInstance();
 }
 
 void PluginService::PurgePluginListCache(BrowserContext* browser_context,
                                          bool reload_pages) {
   for (RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
        !it.IsAtEnd(); it.Advance()) {
@@ skipping 66 matching lines @@
                        KEY_NOTIFY) == ERROR_SUCCESS) {
     if (hklm_key_.StartWatching() == ERROR_SUCCESS) {
       hklm_event_.reset(new base::WaitableEvent(hklm_key_.watch_event()));
       hklm_watcher_.StartWatching(hklm_event_.get(), this);
     }
   }
 #endif
 #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)
 // On ChromeOS the user can't install plugins anyway and on Windows all
 // important plugins register themselves in the registry so no need to do that.
-  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;
   plugin_list_->GetPluginDirectories(&plugin_dirs);
 
   for (size_t i = 0; i < plugin_dirs.size(); ++i) {
     // 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
     FilePathWatcher* watcher = new FilePathWatcher();
     VLOG(1) << "Watching for changes in: " << plugin_dirs[i].value();
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&PluginServiceImpl::RegisterFilePathWatcher, watcher,
-                   plugin_dirs[i], file_watcher_delegate_));
+                   plugin_dirs[i]));
     file_watchers_.push_back(watcher);
   }
 #endif
 }
 
 PluginProcessHost* PluginServiceImpl::FindNpapiPluginProcess(
     const FilePath& plugin_path) {
   for (PluginProcessHostIterator iter; !iter.Done(); ++iter) {
     if (iter->info().path == plugin_path)
       return *iter;
@@ skipping 373 matching lines @@
     return NULL;
   PepperPluginInfo new_pepper_info;
   if (!MakePepperPluginInfo(webplugin_info, &new_pepper_info))
     return NULL;
   ppapi_plugins_.push_back(new_pepper_info);
   return &ppapi_plugins_[ppapi_plugins_.size() - 1];
 }
 
 #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)
 // static
-void PluginServiceImpl::RegisterFilePathWatcher(
-    FilePathWatcher* watcher,
-    const FilePath& path,
-    FilePathWatcher::Delegate* delegate) {
-  bool result = watcher->Watch(path, delegate);
+void PluginServiceImpl::RegisterFilePathWatcher(FilePathWatcher* watcher,
+                                                const FilePath& path) {
+  bool result = watcher->Watch(path, false,
+                               base::Bind(&NotifyPluginDirChanged));
   DCHECK(result);
 }
 #endif
 
 void PluginServiceImpl::SetFilter(PluginServiceFilter* filter) {
   filter_ = filter;
 }
 
 PluginServiceFilter* PluginServiceImpl::GetFilter() {
   return filter_;
@@ skipping 69 matching lines @@
 }
 
 void PluginServiceImpl::SetPluginListForTesting(
     webkit::npapi::PluginList* plugin_list) {
   plugin_list_ = plugin_list;
 }
 
 #if defined(OS_MACOSX)
 void PluginServiceImpl::AppActivated() {
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                            base::Bind(&NotifyPluginsOfActivation));
+                          base::Bind(&NotifyPluginsOfActivation));
 }
 #endif
 
 void PluginServiceImpl::RegisterInternalPlugin(
     const webkit::WebPluginInfo& info,
     bool add_at_beginning) {
   plugin_list_->RegisterInternalPlugin(info, add_at_beginning);
 }
 
 void PluginServiceImpl::GetInternalPlugins(
     std::vector<webkit::WebPluginInfo>* plugins) {
   plugin_list_->GetInternalPlugins(plugins);
 }
 
 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
   return plugin_list_;
 }
 
 }  // namespace content