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

content/common/pepper_plugin_registry.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/native_library.h"
 #include "base/string_split.h"
@@ skipping 71 matching lines @@
       webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS :
       webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS;
 
   info.name = name.empty() ?
       path.BaseName().LossyDisplayName() : UTF8ToUTF16(name);
   info.path = path;
   info.version = ASCIIToUTF16(version);
   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() {
 }
 
 bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info,
                           PepperPluginInfo* pepper_info) {
   if (!webkit::IsPepperPlugin(webplugin_info))
     return false;
 
   pepper_info->is_out_of_process =
       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);
   pepper_info->version = UTF16ToASCII(webplugin_info.version);
   pepper_info->mime_types = webplugin_info.mime_types;
   return true;
 }
 
 // static
 PepperPluginRegistry* PepperPluginRegistry::GetInstance() {
@@ skipping 120 matching lines @@
 base::MessageLoopProxy* PepperPluginRegistry::GetIPCMessageLoop() {
   // This is called only in the renderer so we know we have a child process.
   DCHECK(ChildProcess::current()) << "Must be in the renderer.";
   return ChildProcess::current()->io_message_loop_proxy();
 }
 
 base::WaitableEvent* PepperPluginRegistry::GetShutdownEvent() {
   DCHECK(ChildProcess::current()) << "Must be in the renderer.";
   return ChildProcess::current()->GetShutDownEvent();
 }