Only scan for correct architecture plugin binaries

content/common/plugin_list_win.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/common/plugin_list.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/file_version_info.h"
@@ skipping 344 matching lines @@
   FindClose(find_handle);
 }
 
 void PluginList::GetPluginPathsFromRegistry(
     std::vector<base::FilePath>* plugins) {
   if (PluginList::plugins_discovery_disabled_)
     return;
 
   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();
        i != plugin_dirs.end(); ++i) {
     plugins->push_back(*i);
   }
 }
 
 bool PluginList::ShouldLoadPluginUsingPluginList(
     const WebPluginInfo& info,
@@ skipping 95 matching lines @@
     return false;
 #else
   // The plugin in question could be a 64 bit plugin which we cannot load.
   if (!IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path)))
     return false;
 #endif
   return true;
 }
 
 }  // namespace content