merge {#303347} Plugin service: Use the correct registry key for each watch operation.

content/browser/plugin_service_impl.cc

Index: content/browser/plugin_service_impl.cc
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index 176e80e58eb618339aab95db5e9c28732b82806f..49b66389dd3703de6c9f4cd91d8e228cdc7d7db9 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -200,7 +200,7 @@ void PluginServiceImpl::StartWatchingPlugins() {
                        KEY_NOTIFY) == ERROR_SUCCESS) {
     base::win::RegKey::ChangeCallback callback =
         base::Bind(&PluginServiceImpl::OnKeyChanged, base::Unretained(this),
-                   base::Unretained(&hkcu_key_));
+                   base::Unretained(&hklm_key_));
     hklm_key_.StartWatching(callback);
   }
 #endif
@@ -630,7 +630,7 @@ void PluginServiceImpl::GetPluginsOnIOThread(
 void PluginServiceImpl::OnKeyChanged(base::win::RegKey* key) {
   key->StartWatching(base::Bind(&PluginServiceImpl::OnKeyChanged,
                                 base::Unretained(this),
-                                base::Unretained(&hkcu_key_)));
+                                base::Unretained(key)));
 
   PluginList::Singleton()->RefreshPlugins();
   PurgePluginListCache(NULL, false);