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

webkit/plugins/npapi/plugin_list_posix.cc

-// 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.
 
 #include "webkit/plugins/npapi/plugin_list.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/sha1.h"
 #include "base/stringprintf.h"
 #include "base/string_split.h"
@@ skipping 229 matching lines @@
   LOG_IF(ERROR, PluginList::DebugPluginLoading())
       << "Considering " << info.path.value() << " (" << info.name << ")";
 
   if (IsUndesirablePlugin(info)) {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << info.path.value() << " is undesirable.";
 
     // 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])) {
           // Skip the current undesirable one so we can use the better one
           // we just found.
           LOG_IF(ERROR, PluginList::DebugPluginLoading())
               << "Skipping " << info.path.value() << ", preferring "
               << plugins[j].path.value();
           return false;
         }
       }
     }
   }
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
 
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit