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

content/common/pepper_plugin_registry.cc

Index: content/common/pepper_plugin_registry.cc
===================================================================
--- content/common/pepper_plugin_registry.cc	(revision 101271)
+++ content/common/pepper_plugin_registry.cc	(working copy)
@@ -89,12 +89,22 @@
   info.desc = ASCIIToUTF16(description);
   info.mime_types = mime_types;
 
+  webkit::WebPluginInfo::EnabledStates enabled_state =
+      webkit::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
+
+  if (!enabled) {
+    enabled_state =
+        webkit::WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
+  }
+
+  info.enabled = enabled_state;
   return info;
 }
 
 PepperPluginInfo::PepperPluginInfo()
     : is_internal(false),
-      is_out_of_process(false) {
+      is_out_of_process(false),
+      enabled(true) {
 }
 
 PepperPluginInfo::~PepperPluginInfo() {
@@ -109,6 +119,7 @@
       webplugin_info.type ==
           webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS;
 
+  pepper_info->enabled =  webkit::IsPluginEnabled(webplugin_info);
   pepper_info->path = FilePath(webplugin_info.path);
   pepper_info->name = UTF16ToASCII(webplugin_info.name);
   pepper_info->description = UTF16ToASCII(webplugin_info.desc);
Property changes on: content/common/pepper_plugin_registry.cc
___________________________________________________________________
Added: svn:mergeinfo