Index: content/common/plugin_list_win.cc |
diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc |
index dfc17114d20ff6d3293858ed13e0d2999daee099..e7d4b4b904bf5255f0eebfd9ac020f76702340ac 100644 |
--- a/content/common/plugin_list_win.cc |
+++ b/content/common/plugin_list_win.cc |
@@ -463,9 +463,13 @@ bool PluginList::ShouldLoadPluginUsingPluginList( |
} |
} |
-#if !defined(ARCH_CPU_X86_64) |
- // The plugin in question could be a 64 bit plugin which we cannot load. |
base::FilePath plugin_path(info.path); |
+#if defined(ARCH_CPU_X86_64) |
+ // The plugin in question could be a 32 bit plugin which we cannot load. |
+ if (IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path))) |
+ 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 |