1st CL in a series to remove PluginGroup. Updates PluginList.

webkit/plugins/npapi/plugin_list_posix.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 "webkit/plugins/npapi/plugin_list.h"
 
 #include <algorithm>
 
 #include "base/cpu.h"
 #include "base/file_util.h"
@@ skipping 248 matching lines @@
 
   // Sort the file list by time (and filename).
   std::sort(files.begin(), files.end(), CompareTime);
 
   // Load the files in order.
   for (FileTimeList::const_iterator i = files.begin(); i != files.end(); ++i) {
     plugins->push_back(i->first);
   }
 }
 
+// TODO(ibraaaa): DELETE. http://crbug.com/124396
 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
                                   ScopedVector<PluginGroup>* plugin_groups) {
   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.
@@ skipping 14 matching lines @@
     }
   }
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
 
   return true;
 }
 
+bool PluginList::ShouldLoadPluginUsingPluginList(
+    const WebPluginInfo& info, std::vector<webkit::WebPluginInfo>* plugins) {
+  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 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