Revert of Remove raw handles from base::win::RegKey

content/browser/plugin_service_impl.h

Index: content/browser/plugin_service_impl.h
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
index 0b5cc5fe2779c7cbf23ffde1a3989175b5e1a01b..a0353e5a51d50fed4a3fcc83977070e8f9470131 100644
--- a/content/browser/plugin_service_impl.h
+++ b/content/browser/plugin_service_impl.h
@@ -166,9 +166,7 @@
   PluginServiceImpl();
   virtual ~PluginServiceImpl();
 
-#if defined(OS_WIN)
-  void OnKeyChanged(base::win::RegKey* key);
-#endif
+  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
@@ -226,6 +224,10 @@
   // 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_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)