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

webkit/plugins/npapi/plugin_list_posix.cc

Index: webkit/plugins/npapi/plugin_list_posix.cc
===================================================================
--- webkit/plugins/npapi/plugin_list_posix.cc	(revision 101271)
+++ webkit/plugins/npapi/plugin_list_posix.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.
 
@@ -248,7 +248,7 @@
     // See if we have a better version of this plugin.
     for (size_t i = 0; i < plugin_groups->size(); ++i) {
       const std::vector<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].name == info.name &&
             !IsUndesirablePlugin(plugins[j])) {
Property changes on: webkit/plugins/npapi/plugin_list_posix.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/npapi/plugin_list_posix.cc:r3734-4217,4606-5108,5177-5263