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

webkit/plugins/npapi/plugin_lib_win.cc

Index: webkit/plugins/npapi/plugin_lib_win.cc
===================================================================
--- webkit/plugins/npapi/plugin_lib_win.cc	(revision 101271)
+++ webkit/plugins/npapi/plugin_lib_win.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -38,6 +38,7 @@
   info->desc = version_info->file_description();
   info->version = version_info->file_version();
   info->path = filename;
+  info->enabled = WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
 
   // TODO(evan): Move the ParseMimeTypes code inline once Pepper is updated.
   if (!PluginList::ParseMimeTypes(
Property changes on: webkit/plugins/npapi/plugin_lib_win.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/npapi/plugin_lib_win.cc:r3734-4217,4606-5108,5177-5263