Policy: Re-enabled plugin still disabled

webkit/glue/plugins/plugin_group_unittest.cc

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..044c7c781a73b369f9fdf30d106c3d14a6b81f59 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:
@@ -81,7 +81,7 @@ TEST(PluginGroupTest, PluginGroupMatch) {
   scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
       kPluginDef3));
   EXPECT_TRUE(group->Match(kPlugin3045));
-  group->AddPlugin(kPlugin3045, 0);
+  group->AddPlugin(kPlugin3045, 0, NULL);
   EXPECT_FALSE(group->IsVulnerable());
 }
 
@@ -115,11 +115,11 @@ TEST(PluginGroupTest, PluginGroupDescription) {
       scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
           plugindefs[i]));
       EXPECT_TRUE(group->Match(plugin3043));
-      group->AddPlugin(plugin3043, 0);
+      group->AddPlugin(plugin3043, 0, NULL);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
       EXPECT_TRUE(group->Match(plugin3045));
-      group->AddPlugin(plugin3045, 1);
+      group->AddPlugin(plugin3045, 1, NULL);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
     }
@@ -130,12 +130,12 @@ TEST(PluginGroupTest, PluginGroupDescription) {
       scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
           plugindefs[i]));
       EXPECT_TRUE(group->Match(plugin3043));
-      group->AddPlugin(plugin3043, 0);
+      group->AddPlugin(plugin3043, 0, NULL);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
       EXPECT_FALSE(group->Enabled());
       EXPECT_TRUE(group->Match(plugin3045));
-      group->AddPlugin(plugin3045, 1);
+      group->AddPlugin(plugin3045, 1, NULL);
       EXPECT_EQ(desc3045, group->description());
       EXPECT_FALSE(group->IsVulnerable());
     }
@@ -146,11 +146,11 @@ TEST(PluginGroupTest, PluginGroupDescription) {
       scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
           plugindefs[i]));
       EXPECT_TRUE(group->Match(plugin3043));
-      group->AddPlugin(plugin3043, 1);
+      group->AddPlugin(plugin3043, 1, NULL);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
       EXPECT_TRUE(group->Match(plugin3045));
-      group->AddPlugin(plugin3045, 0);
+      group->AddPlugin(plugin3045, 0, NULL);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
     }
@@ -175,8 +175,9 @@ TEST(PluginGroupTest, DisableOutdated) {
   for (size_t i = 0; i < 2; ++i) {
     scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
         plugindefs[i]));
-    group->AddPlugin(kPlugin3043, 0);
-    group->AddPlugin(kPlugin3045, 1);
+    group->AddPlugin(kPlugin3043, 0, NULL);
+    group->AddPlugin(kPlugin3045, 1, NULL);
+
     EXPECT_EQ(ASCIIToUTF16("MyPlugin version 3.0.43"), group->description());
     EXPECT_TRUE(group->IsVulnerable());
 
@@ -199,10 +200,11 @@ 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);
+    group->AddPlugin(plugin, 0, NULL);
     scoped_ptr<DictionaryValue> data(group->GetDataForUI());
     std::string version;
     data->GetString("version", &version);