Policy: Re-enabled plugin still disabled

webkit/glue/plugins/plugin_list_posix.cc

Index: webkit/glue/plugins/plugin_list_posix.cc
diff --git a/webkit/glue/plugins/plugin_list_posix.cc b/webkit/glue/plugins/plugin_list_posix.cc
index 654c0c5792fc09141be47bb51ffdef7cdc8766e4..7da83b4eec83107ffd1857a3a7c9e5c1c7a04125 100644
--- a/webkit/glue/plugins/plugin_list_posix.cc
+++ b/webkit/glue/plugins/plugin_list_posix.cc
@@ -164,7 +164,6 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
 }
 
 void PluginList::LoadPluginsFromDir(const FilePath& dir_path,
-                                    std::vector<WebPluginInfo>* plugins,
                                     std::set<FilePath>* visited_plugins) {
   // See ScanPluginsDirectory near
   // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginHostImpl.cpp#5052
@@ -233,12 +232,11 @@ void PluginList::LoadPluginsFromDir(const FilePath& dir_path,
 
   // Load the files in order.
   for (FileTimeList::const_iterator i = files.begin(); i != files.end(); ++i) {
-    LoadPlugin(i->first, plugins);
+    LoadPlugin(i->first);
   }
 }
 
-bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
-                                  std::vector<WebPluginInfo>* plugins) {
+bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) {
   LOG_IF(ERROR, PluginList::DebugPluginLoading())
       << "Considering " << info.path.value() << " (" << info.name << ")";
 
@@ -247,15 +245,23 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
         << info.path.value() << " is undesirable.";
 
     // See if we have a better version of this plugin.
-    for (size_t i = 0; i < plugins->size(); ++i) {
-      if (plugins->at(i).name == info.name &&
-          !IsUndesirablePlugin(plugins->at(i))) {
-        // Skip the current undesirable one so we can use the better one
-        // we just found.
-        LOG_IF(ERROR, PluginList::DebugPluginLoading())
-            << "Skipping " << info.path.value() << ", preferring "
-            << plugins->at(i).path.value();
-        return false;
+    std::vector<WebPluginInfo*> new_plugins;
+    PluginGroup::PluginMap::iterator current_group = plugin_groups_.begin();
+    for (; current_group != plugin_groups_.end(); ++current_group) {
+      std::list<WebPluginInfo>& group_plugins =
+          current_group->second->GetPlugins();
+      for (std::list<WebPluginInfo>::iterator it = group_plugins.begin();
+           it != group_plugins.end();
+           ++it) {
+        if (it->name == info.name &&
+            !IsUndesirablePlugin(*it)) {
+          // Skip the current undesirable one so we can use the better one
+          // we just found.
+          LOG_IF(ERROR, PluginList::DebugPluginLoading())
+              << "Skipping " << info.path.value() << ", preferring "
+              << it->path.value();
+          return false;
+        }
       }
     }
   }