Refactor: Simplify WaitableEventWatcher.

content/browser/plugin_service_impl.h

 // 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.
 
 // 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_IMPL_H_
 #define CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 
@@ skipping 46 matching lines @@
 // base::Bind() has limited arity, and the filter-related methods tend to
 // surpass that limit.
 struct PluginServiceFilterParams {
   int render_process_id;
   int render_view_id;
   GURL page_url;
   ResourceContext* resource_context;
 };
 
 class CONTENT_EXPORT PluginServiceImpl
-    : NON_EXPORTED_BASE(public PluginService),
-      public base::WaitableEventWatcher::Delegate {
+    : NON_EXPORTED_BASE(public PluginService) {
  public:
   // Returns the PluginServiceImpl singleton.
   static PluginServiceImpl* GetInstance();
 
   // PluginService implementation:
   virtual void Init() OVERRIDE;
   virtual void StartWatchingPlugins() OVERRIDE;
   virtual bool GetPluginInfoArray(
       const GURL& url,
       const std::string& mime_type,
@@ skipping 71 matching lines @@
   void RegisterPluginCrash(const FilePath& plugin_path);
 
  private:
   friend struct DefaultSingletonTraits<PluginServiceImpl>;
 
   // Creates the PluginServiceImpl object, but doesn't actually build the plugin
   // list yet.  It's generated lazily.
   PluginServiceImpl();
   virtual ~PluginServiceImpl();
 
-  // base::WaitableEventWatcher::Delegate implementation.
-  virtual void OnWaitableEventSignaled(
-      base::WaitableEvent* waitable_event) OVERRIDE;
+  void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
 
   // Returns the plugin process host corresponding to the plugin process that
   // has been started by this service. Returns NULL if no process has been
   // started.
   PluginProcessHost* FindNpapiPluginProcess(const FilePath& plugin_path);
   PpapiPluginProcessHost* FindPpapiPluginProcess(
       const FilePath& plugin_path,
       const FilePath& profile_data_directory);
   PpapiPluginProcessHost* FindPpapiBrokerProcess(const FilePath& broker_path);
 
@@ skipping 36 matching lines @@
   webkit::npapi::PluginList* plugin_list_;
 
 #if defined(OS_WIN)
   // 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_;
+  base::Callback<void(base::WaitableEvent*)> registry_watcher_callback_;
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)
   ScopedVector<base::FilePathWatcher> file_watchers_;
 #endif
 
   std::vector<PepperPluginInfo> ppapi_plugins_;
 
   // Weak pointer; outlives us.
   PluginServiceFilter* filter_;
 
   std::set<PluginProcessHost::Client*> pending_plugin_clients_;
 
   // Used to sequentialize loading plug-ins from disk.
   base::SequencedWorkerPool::SequenceToken plugin_list_token_;
 
 #if defined(OS_POSIX)
   scoped_refptr<PluginLoaderPosix> plugin_loader_;
 #endif
 
   // Used to detect if a given plug-in is crashing over and over.
   std::map<FilePath, std::vector<base::Time> > crash_times_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_