Reland r101269: Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo.

webkit/plugins/npapi/plugin_list_win.cc

Index: webkit/plugins/npapi/plugin_list_win.cc
diff --git a/webkit/plugins/npapi/plugin_list_win.cc b/webkit/plugins/npapi/plugin_list_win.cc
index b739771f0b4400288428740c604e14c7b6f6dd3c..0f832e907232993dd4eb52e42a8a67d17d18d2b1 100644
--- a/webkit/plugins/npapi/plugin_list_win.cc
+++ b/webkit/plugins/npapi/plugin_list_win.cc
@@ -358,7 +358,7 @@ bool PluginList::ShouldLoadPlugin(const webkit::WebPluginInfo& info,
 
   for (size_t i = 0; i < plugin_groups->size(); ++i) {
     const std::vector<webkit::WebPluginInfo>& plugins =
-        (*plugin_groups)[i]->web_plugins_info();
+        (*plugin_groups)[i]->web_plugin_infos();
     for (size_t j = 0; j < plugins.size(); ++j) {
       std::wstring plugin1 =
           StringToLowerASCII(plugins[j].path.BaseName().value());
@@ -420,7 +420,7 @@ bool PluginList::ShouldLoadPlugin(const webkit::WebPluginInfo& info,
 
     for (size_t i = 0; i < plugin_groups->size(); ++i) {
       const std::vector<webkit::WebPluginInfo>& plugins =
-          (*plugin_groups)[i]->web_plugins_info();
+          (*plugin_groups)[i]->web_plugin_infos();
       for (size_t j = 0; j < plugins.size(); ++j) {
         if (plugins[j].path.BaseName().value() == kOldWMPPlugin) {
           (*plugin_groups)[i]->RemovePlugin(plugins[j].path);
@@ -431,7 +431,7 @@ bool PluginList::ShouldLoadPlugin(const webkit::WebPluginInfo& info,
   } else if (filename == kOldWMPPlugin) {
     for (size_t i = 0; i < plugin_groups->size(); ++i) {
       const std::vector<webkit::WebPluginInfo>& plugins =
-          (*plugin_groups)[i]->web_plugins_info();
+          (*plugin_groups)[i]->web_plugin_infos();
       for (size_t j = 0; j < plugins.size(); ++j) {
         if (plugins[j].path.BaseName().value() == kNewWMPPlugin)
           return false;