Revert 101269 - Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo, to ...

webkit/plugins/npapi/plugin_list_win.cc

Index: webkit/plugins/npapi/plugin_list_win.cc
===================================================================
--- webkit/plugins/npapi/plugin_list_win.cc	(revision 101271)
+++ webkit/plugins/npapi/plugin_list_win.cc	(working copy)
@@ -358,7 +358,7 @@
 
   for (size_t i = 0; i < plugin_groups->size(); ++i) {
     const std::vector<webkit::WebPluginInfo>& plugins =
-        (*plugin_groups)[i]->web_plugin_infos();
+        (*plugin_groups)[i]->web_plugins_info();
     for (size_t j = 0; j < plugins.size(); ++j) {
       std::wstring plugin1 =
           StringToLowerASCII(plugins[j].path.BaseName().value());
@@ -420,7 +420,7 @@
 
     for (size_t i = 0; i < plugin_groups->size(); ++i) {
       const std::vector<webkit::WebPluginInfo>& plugins =
-          (*plugin_groups)[i]->web_plugin_infos();
+          (*plugin_groups)[i]->web_plugins_info();
       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 @@
   } else if (filename == kOldWMPPlugin) {
     for (size_t i = 0; i < plugin_groups->size(); ++i) {
       const std::vector<webkit::WebPluginInfo>& plugins =
-          (*plugin_groups)[i]->web_plugin_infos();
+          (*plugin_groups)[i]->web_plugins_info();
       for (size_t j = 0; j < plugins.size(); ++j) {
         if (plugins[j].path.BaseName().value() == kNewWMPPlugin)
           return false;
Property changes on: webkit/plugins/npapi/plugin_list_win.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/npapi/plugin_list_win.cc:r3734-4217,4606-5108,5177-5263