Policy: Re-enabled plugin still disabled

webkit/plugins/npapi/webplugininfo.cc

 // Copyright (c) 2010 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 "webkit/plugins/npapi/webplugininfo.h"
 
+#include "base/logging.h"
+
 namespace webkit {
 namespace npapi {
 
 WebPluginMimeType::WebPluginMimeType() {}
 
 WebPluginMimeType::~WebPluginMimeType() {}
 
-WebPluginInfo::WebPluginInfo() : enabled(false) {}
+WebPluginInfo::WebPluginInfo()
+    : enabled(USER_DISABLED_POLICY_UNMANAGED) {
+}
 
 WebPluginInfo::WebPluginInfo(const WebPluginInfo& rhs)
     : name(rhs.name),
       path(rhs.path),
       version(rhs.version),
       desc(rhs.desc),
       mime_types(rhs.mime_types),
       enabled(rhs.enabled) {
 }
 
@@ skipping 11 matching lines @@
 
 WebPluginInfo::WebPluginInfo(const string16& fake_name,
                              const FilePath& fake_path,
                              const string16& fake_version,
                              const string16& fake_desc)
     : name(fake_name),
       path(fake_path),
       version(fake_version),
       desc(fake_desc),
       mime_types(),
-      enabled(true) {
+      enabled(USER_ENABLED_POLICY_UNMANAGED) {
+}
+
+bool IsPluginEnabled(const WebPluginInfo& plugin) {
+  return ((plugin.enabled & WebPluginInfo::POLICY_ENABLED) ||
+          plugin.enabled == WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED);
 }
 
 }  // namespace npapi
 }  // namespace webkit
-