Only scan for correct architecture plugin binaries

content/common/plugin_list_win.cc

Index: content/common/plugin_list_win.cc
diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc
index f58a167696533fbe12e5b2d87e7bfa77535a464f..ccc994b8f5563f65c46873e52433825cf7275970 100644
--- a/content/common/plugin_list_win.cc
+++ b/content/common/plugin_list_win.cc
@@ -362,17 +362,15 @@ void PluginList::GetPluginPathsFromRegistry(
 
   std::set<base::FilePath> plugin_dirs;
 
+  // Search for plugins from HKCU and HKLM.  THis will only find plugins that
+  // are correctly registered in the correct WOW64 registry hive.
   GetPluginsInRegistryDirectory(HKEY_CURRENT_USER,
                                 kRegistryMozillaPlugins,
                                 0,
                                 &plugin_dirs);
   GetPluginsInRegistryDirectory(HKEY_LOCAL_MACHINE,
                                 kRegistryMozillaPlugins,
-                                KEY_WOW64_64KEY,
-                                &plugin_dirs);
-  GetPluginsInRegistryDirectory(HKEY_LOCAL_MACHINE,
-                                kRegistryMozillaPlugins,
-                                KEY_WOW64_32KEY,
+                                0,
                                 &plugin_dirs);
 
   for (std::set<base::FilePath>::iterator i = plugin_dirs.begin();