Index: webkit/glue/plugins/plugin_group_unittest.cc |
diff --git a/webkit/glue/plugins/plugin_group_unittest.cc b/webkit/glue/plugins/plugin_group_unittest.cc |
index 31dee1e0fa4a3288a2f18d7139e8790d513f4d7f..796897afa0cc2d8d8b6c92a6f6281d03b3623a32 100644 |
--- a/webkit/glue/plugins/plugin_group_unittest.cc |
+++ b/webkit/glue/plugins/plugin_group_unittest.cc |
@@ -47,20 +47,20 @@ static const PluginGroupDefinition kPluginDefNotVulnerable = { |
// name, path, version, desc, mime_types, enabled. |
static WebPluginInfo kPlugin2043 = WebPluginInfo( |
- ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("2.0.43"), |
- ASCIIToUTF16("MyPlugin version 2.0.43")); |
+ ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.2.0.43")), |
+ ASCIIToUTF16("2.0.43"), ASCIIToUTF16("MyPlugin version 2.0.43")); |
static WebPluginInfo kPlugin3043 = WebPluginInfo( |
- ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("3.0.43"), |
- ASCIIToUTF16("MyPlugin version 3.0.43")); |
+ ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.43")), |
+ ASCIIToUTF16("3.0.43"), ASCIIToUTF16("MyPlugin version 3.0.43")); |
static WebPluginInfo kPlugin3044 = WebPluginInfo( |
- ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("3.0.44"), |
- ASCIIToUTF16("MyPlugin version 3.0.44")); |
+ ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.44")), |
+ ASCIIToUTF16("3.0.44"), ASCIIToUTF16("MyPlugin version 3.0.44")); |
static WebPluginInfo kPlugin3045 = WebPluginInfo( |
- ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("3.0.45"), |
- ASCIIToUTF16("MyPlugin version 3.0.45")); |
+ ASCIIToUTF16("MyPlugin"), FilePath(FILE_PATH_LITERAL("myplugin.so.3.0.45")), |
+ ASCIIToUTF16("3.0.45"), ASCIIToUTF16("MyPlugin version 3.0.45")); |
static WebPluginInfo kPlugin4043 = WebPluginInfo( |
- ASCIIToUTF16("MyPlugin"), ASCIIToUTF16("4.0.43"), |
- ASCIIToUTF16("MyPlugin version 4.0.43")); |
+ 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: |
@@ -177,6 +177,7 @@ TEST(PluginGroupTest, DisableOutdated) { |
plugindefs[i])); |
group->AddPlugin(kPlugin3043, 0); |
group->AddPlugin(kPlugin3045, 1); |
+ |
EXPECT_EQ(ASCIIToUTF16("MyPlugin version 3.0.43"), group->description()); |
EXPECT_TRUE(group->IsVulnerable()); |
@@ -199,7 +200,8 @@ TEST(PluginGroupTest, VersionExtraction) { |
for (size_t i = 0; i < arraysize(versions); i++) { |
const WebPluginInfo plugin = WebPluginInfo( |
- ASCIIToUTF16("Blah Plugin"), ASCIIToUTF16(versions[i][0]), string16()); |
+ ASCIIToUTF16("Blah Plugin"), FilePath(FILE_PATH_LITERAL("blahfile")), |
+ ASCIIToUTF16(versions[i][0]), string16()); |
scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(plugin)); |
EXPECT_TRUE(group->Match(plugin)); |
group->AddPlugin(plugin, 0); |