Return matching plug-ins in the sorted order (by version number).

content/common/plugin_list_unittest.cc

Index: content/common/plugin_list_unittest.cc
diff --git a/content/common/plugin_list_unittest.cc b/content/common/plugin_list_unittest.cc
index a9e592ef4bf419602cdbc781d361af8df13f0572..af99672cccecaf2382204511cbca4122c87ed8da 100644
--- a/content/common/plugin_list_unittest.cc
+++ b/content/common/plugin_list_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "content/common/plugin_list.h"
 
+#include <string>
+
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -36,6 +38,18 @@ bool Contains(const std::vector<WebPluginInfo>& list,
   return false;
 }
 
+WebPluginInfo CreateFooPluginWithVersion(const std::string& version) {
+  base::FilePath plugin_path = base::FilePath::FromUTF8Unsafe(
+      std::string("/plugins/foo") + version + std::string(".plugin"));
+  WebPluginInfo plugin(ASCIIToUTF16(kFooName),
+                       plugin_path,
+                       ASCIIToUTF16(version.c_str()),
+                       base::string16());
+  plugin.mime_types.push_back(
+      WebPluginMimeType(kFooMimeType, kFooFileType, std::string()));
+  return plugin;
+}
+
 }  // namespace
 
 class PluginListTest : public testing::Test {
@@ -136,6 +150,36 @@ TEST_F(PluginListTest, GetPluginInfoArray) {
   EXPECT_EQ(kFooMimeType, actual_mime_types.front());
 }
 
+TEST_F(PluginListTest, GetPluginInfoArrayVersionOrder) {
+  GURL target_url("http://example.com/test.foo");
+
+  // Set up 3 plug-ins that differ in version, randomly ordered.
+  std::vector<WebPluginInfo> test_plugins;
+  WebPluginInfo plugin_v1 = CreateFooPluginWithVersion("1.2.3");
+  WebPluginInfo plugin_v2 = CreateFooPluginWithVersion("2.3.4");
+  WebPluginInfo plugin_v3 = CreateFooPluginWithVersion("3.4.5");
+  test_plugins.push_back(plugin_v3);
+  test_plugins.push_back(plugin_v1);
+  test_plugins.push_back(plugin_v2);
+  plugin_list_.SetPlugins(test_plugins);
+
+  std::vector<WebPluginInfo> matched_plugins;
+  std::vector<std::string> actual_mime_types;
+  plugin_list_.GetPluginInfoArray(target_url,
+                                  kFooMimeType,
+                                  false,  // allow_wildcard
+                                  NULL,   // use_stale
+                                  false,  // include_npapi
+                                  &matched_plugins,
+                                  &actual_mime_types);
+
+  EXPECT_EQ(3u, matched_plugins.size());
+  // Must be ordered from the highest to lowest version.
+  EXPECT_TRUE(Equals(matched_plugins[0], plugin_v3));
+  EXPECT_TRUE(Equals(matched_plugins[1], plugin_v2));
+  EXPECT_TRUE(Equals(matched_plugins[2], plugin_v1));
+}
+
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 
 // Test parsing a simple description: Real Audio.