Move version metadata from PluginGroup into PluginInstaller.

webkit/plugins/npapi/plugin_group_unittest.cc

Index: webkit/plugins/npapi/plugin_group_unittest.cc
diff --git a/webkit/plugins/npapi/plugin_group_unittest.cc b/webkit/plugins/npapi/plugin_group_unittest.cc
index 20332969ac13709dbc1333f3f43f1ab21e514f64..a4f55473d1704171aebf2c9788726c32744a8482 100644
--- a/webkit/plugins/npapi/plugin_group_unittest.cc
+++ b/webkit/plugins/npapi/plugin_group_unittest.cc
@@ -8,128 +8,14 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
-#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/values.h"
 #include "base/version.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/plugins/webplugininfo.h"
 
 namespace webkit {
 namespace npapi {
 
-static const VersionRangeDefinition kPluginVersionRange[] = {
-    { "", "", "3.0.44" }
-};
-static const VersionRangeDefinition kPlugin3VersionRange[] = {
-    { "0", "4", "3.0.44" }
-};
-static const VersionRangeDefinition kPlugin4VersionRange[] = {
-    { "4", "5", "4.0.44" }
-};
-static const VersionRangeDefinition kPlugin34VersionRange[] = {
-    { "0", "4", "3.0.44" },
-    { "4", "5", "" }
-};
-
-static const PluginGroupDefinition kPluginDef = {
-    "myplugin", "MyPlugin", "MyPlugin", kPluginVersionRange,
-    arraysize(kPluginVersionRange) };
-static const PluginGroupDefinition kPluginDef3 = {
-    "myplugin-3", "MyPlugin 3", "MyPlugin", kPlugin3VersionRange,
-    arraysize(kPlugin3VersionRange) };
-static const PluginGroupDefinition kPluginDef4 = {
-    "myplugin-4", "MyPlugin 4", "MyPlugin", kPlugin4VersionRange,
-    arraysize(kPlugin4VersionRange) };
-static const PluginGroupDefinition kPluginDef34 = {
-    "myplugin-34", "MyPlugin 3/4", "MyPlugin", kPlugin34VersionRange,
-    arraysize(kPlugin34VersionRange) };
-static const PluginGroupDefinition kPluginDefNotVulnerable = {
-    "myplugin-latest", "MyPlugin", "MyPlugin", NULL, 0 };
-
-const PluginGroupDefinition kPluginDefinitions[] = {
-  kPluginDef,
-  kPluginDef3,
-  kPluginDef4,
-  kPluginDef34,
-  kPluginDefNotVulnerable,
-};
-
-// name, path, version, desc.
-static const WebPluginInfo kPluginNoVersion = WebPluginInfo(
-    ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")),
-    string16(), ASCIIToUTF16("MyPlugin version 2.0.43"));
-static const WebPluginInfo kPlugin2043 = WebPluginInfo(
-    ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")),
-    ASCIIToUTF16("2.0.43"), ASCIIToUTF16("MyPlugin version 2.0.43"));
-static const WebPluginInfo kPlugin3043 = WebPluginInfo(
-    ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.43")),
-    ASCIIToUTF16("3.0.43"), ASCIIToUTF16("MyPlugin version 3.0.43"));
-static const WebPluginInfo kPlugin3044 = WebPluginInfo(
-    ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.44")),
-    ASCIIToUTF16("3.0.44"), ASCIIToUTF16("MyPlugin version 3.0.44"));
-static const WebPluginInfo kPlugin3045 = WebPluginInfo(
-    ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.45")),
-     ASCIIToUTF16("3.0.45"), ASCIIToUTF16("MyPlugin version 3.0.45"));
-static const WebPluginInfo kPlugin3045r = WebPluginInfo(
-    ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.45")),
-     ASCIIToUTF16("3.0r45"), ASCIIToUTF16("MyPlugin version 3.0r45"));
-static const WebPluginInfo kPlugin4043 = WebPluginInfo(
-    ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.4.0.43")),
-     ASCIIToUTF16("4.0.43"), ASCIIToUTF16("MyPlugin version 4.0.43"));
-
-class PluginGroupTest : public testing::Test {
- public:
-  static PluginGroup* CreatePluginGroup(
-      const PluginGroupDefinition& definition) {
-    return PluginGroup::FromPluginGroupDefinition(definition);
-  }
-  static PluginGroup* CreatePluginGroup(const WebPluginInfo& wpi) {
-    return PluginGroup::FromWebPluginInfo(wpi);
-  }
-};
-
-TEST_F(PluginGroupTest, PluginGroupMatch) {
-  scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
-      kPluginDef3));
-  EXPECT_TRUE(group->Match(kPlugin3045));
-  EXPECT_TRUE(group->Match(kPlugin3045r));
-  EXPECT_FALSE(group->Match(kPluginNoVersion));
-  group->AddPlugin(kPlugin3045);
-  EXPECT_FALSE(group->IsVulnerable(kPlugin3045));
-
-  group.reset(PluginGroupTest::CreatePluginGroup(kPluginDef));
-  EXPECT_FALSE(group->Match(kPluginNoVersion));
-}
-
-TEST_F(PluginGroupTest, PluginGroupMatchCorrectVersion) {
-  scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
-      kPluginDef3));
-  EXPECT_TRUE(group->Match(kPlugin2043));
-  EXPECT_TRUE(group->Match(kPlugin3043));
-  EXPECT_FALSE(group->Match(kPlugin4043));
-
-  group.reset(PluginGroupTest::CreatePluginGroup(kPluginDef4));
-  EXPECT_FALSE(group->Match(kPlugin2043));
-  EXPECT_FALSE(group->Match(kPlugin3043));
-  EXPECT_TRUE(group->Match(kPlugin4043));
-
-  group.reset(PluginGroupTest::CreatePluginGroup(kPluginDef34));
-  EXPECT_TRUE(group->Match(kPlugin2043));
-  EXPECT_TRUE(group->Match(kPlugin3043));
-  EXPECT_TRUE(group->Match(kPlugin4043));
-}
-
-TEST_F(PluginGroupTest, PluginGroupDefinition) {
-  for (size_t i = 0; i < arraysize(kPluginDefinitions); ++i) {
-    scoped_ptr<PluginGroup> def_group(
-        PluginGroupTest::CreatePluginGroup(kPluginDefinitions[i]));
-    ASSERT_TRUE(def_group.get() != NULL);
-  }
-}
-
-TEST_F(PluginGroupTest, VersionExtraction) {
+TEST(PluginGroupTest, VersionExtraction) {
   // Some real-world plugin versions (spaces, commata, parentheses, 'r', oh my)
   const char* versions[][2] = {
     { "7.6.6 (1671)", "7.6.6.1671" },  // Quicktime
@@ -146,46 +32,9 @@ TEST_F(PluginGroupTest, VersionExtraction) {
   for (size_t i = 0; i < arraysize(versions); i++) {
     scoped_ptr<Version> version(PluginGroup::CreateVersionFromString(
         ASCIIToUTF16(versions[i][0])));
-    EXPECT_STREQ(versions[i][1], version->GetString().c_str());
+    EXPECT_EQ(versions[i][1], version->GetString());
   }
 }
 
-TEST_F(PluginGroupTest, IsVulnerable) {
-  // Adobe Reader 10
-  VersionRangeDefinition adobe_reader_version_range[] = {
-      { "10", "11", "" },
-      { "9", "10", "9.4.1" },
-      { "0", "9", "8.2.5" }
-  };
-  PluginGroupDefinition adobe_reader_plugin_def = {
-      "adobe-reader", "Adobe Reader", "Adobe Acrobat",
-      adobe_reader_version_range, arraysize(adobe_reader_version_range) };
-  WebPluginInfo adobe_reader_plugin(ASCIIToUTF16("Adobe Reader"),
-                                    FilePath(FILE_PATH_LITERAL("/reader.so")),
-                                    ASCIIToUTF16("10.0.0.396"),
-                                    ASCIIToUTF16("adobe reader 10"));
-  scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
-      adobe_reader_plugin_def));
-  group->AddPlugin(adobe_reader_plugin);
-  PluginGroup group_copy(*group);  // Exercise the copy constructor.
-  EXPECT_FALSE(group_copy.IsVulnerable(adobe_reader_plugin));
-
-  // Silverlight 4
-  VersionRangeDefinition silverlight_version_range[] = {
-      { "0", "4", "3.0.50106.0" },
-      { "4", "5", "" }
-  };
-  PluginGroupDefinition silverlight_plugin_def = {
-      "silverlight", "Silverlight", "Silverlight", silverlight_version_range,
-      arraysize(silverlight_version_range) };
-  WebPluginInfo silverlight_plugin(ASCIIToUTF16("Silverlight"),
-                                   FilePath(FILE_PATH_LITERAL("/silver.so")),
-                                   ASCIIToUTF16("4.0.50917.0"),
-                                   ASCIIToUTF16("silverlight 4"));
-  group.reset(PluginGroupTest::CreatePluginGroup(silverlight_plugin_def));
-  group->AddPlugin(silverlight_plugin);
-  EXPECT_FALSE(PluginGroup(*group).IsVulnerable(silverlight_plugin));
-}
-
 }  // namespace npapi
 }  // namespace webkit