Policy: Re-enabled plugin still disabled

webkit/plugins/npapi/plugin_group_unittest.cc

 // Copyright (c) 2010 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_group.h"
 
 #include <string>
 #include <vector>
 
 #include "base/scoped_ptr.h"
@@ skipping 74 matching lines @@
     PluginGroup::SetPolicyDisabledPluginPatterns(std::set<string16>());
   }
 };
 
 TEST(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, 0);
+  group->AddPlugin(kPlugin3045);
   EXPECT_FALSE(group->IsVulnerable());
 
   group.reset(PluginGroupTest::CreatePluginGroup(kPluginDef));
   EXPECT_FALSE(group->Match(kPluginNoVersion));
 }
 
 TEST(PluginGroupTest, PluginGroupMatchCorrectVersion) {
   scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
       kPluginDef3));
   EXPECT_TRUE(group->Match(kPlugin2043));
@@ skipping 17 matching lines @@
 
   PluginGroupDefinition plugindefs[] =
       { kPluginDef, kPluginDef3, kPluginDef34 };
   for (size_t i = 0; i < arraysize(plugindefs); ++i) {
     WebPluginInfo plugin3043(kPlugin3043);
     WebPluginInfo plugin3045(kPlugin3045);
     {
       scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
           plugindefs[i]));
       EXPECT_TRUE(group->Match(plugin3043));
-      group->AddPlugin(plugin3043, 0);
+      group->AddPlugin(plugin3043);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
       EXPECT_TRUE(group->Match(plugin3045));
-      group->AddPlugin(plugin3045, 1);
+      group->AddPlugin(plugin3045);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
     }
-
     {
-      // Disable the first plugin.
-      plugin3043.enabled = false;
+      // Disable the second plugin.
+      plugin3045.enabled =
+          webkit::npapi::WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
       scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
           plugindefs[i]));
       EXPECT_TRUE(group->Match(plugin3043));
-      group->AddPlugin(plugin3043, 0);
-      EXPECT_EQ(desc3043, group->description());
-      EXPECT_TRUE(group->IsVulnerable());
-      EXPECT_FALSE(group->Enabled());
-      EXPECT_TRUE(group->Match(plugin3045));
-      group->AddPlugin(plugin3045, 1);
-      EXPECT_EQ(desc3045, group->description());
-      EXPECT_FALSE(group->IsVulnerable());
-    }
-
-    {
-      // Disable the second plugin.
-      plugin3045.enabled = false;
-      scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
-          plugindefs[i]));
-      EXPECT_TRUE(group->Match(plugin3043));
-      group->AddPlugin(plugin3043, 1);
+      group->AddPlugin(plugin3043);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
       EXPECT_TRUE(group->Match(plugin3045));
-      group->AddPlugin(plugin3045, 0);
+      group->AddPlugin(plugin3045);
       EXPECT_EQ(desc3043, group->description());
       EXPECT_TRUE(group->IsVulnerable());
     }
   }
 }
 
 TEST(PluginGroupTest, PluginGroupDefinition) {
   const PluginGroupDefinition* definitions =
       PluginList::GetPluginGroupDefinitions();
   for (size_t i = 0; i < PluginList::GetPluginGroupDefinitionsSize(); ++i) {
     scoped_ptr<PluginGroup> def_group(
         PluginGroupTest::CreatePluginGroup(definitions[i]));
     ASSERT_TRUE(def_group.get() != NULL);
     EXPECT_FALSE(def_group->Match(kPlugin2043));
   }
 }
 
 TEST(PluginGroupTest, DisableOutdated) {
   PluginGroupDefinition plugindefs[] = { kPluginDef3, kPluginDef34 };
   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);
+    group->AddPlugin(kPlugin3045);
+
     EXPECT_EQ(ASCIIToUTF16("MyPlugin version 3.0.43"), group->description());
     EXPECT_TRUE(group->IsVulnerable());
 
     group->DisableOutdatedPlugins();
     EXPECT_EQ(ASCIIToUTF16("MyPlugin version 3.0.45"), group->description());
     EXPECT_FALSE(group->IsVulnerable());
   }
 }
 
 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
     { "2, 0, 0, 254", "2.0.0.254" },   // DivX
     { "3, 0, 0, 0", "3.0.0.0" },       // Picasa
     { "1, 0, 0, 1", "1.0.0.1" },       // Earth
     { "10,0,45,2", "10.0.45.2" },      // Flash
     { "11.5.7r609", "11.5.7.609"},     // Shockwave
     { "10.1 r102", "10.1.102"},        // Flash
     { "1.6.0_22", "1.6.0.22"},         // Java
   };
 
   for (size_t i = 0; i < arraysize(versions); i++) {
     const WebPluginInfo plugin = WebPluginInfo(
         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);
     scoped_ptr<DictionaryValue> data(group->GetDataForUI());
     std::string version;
     data->GetString("version", &version);
     EXPECT_EQ(versions[i][1], version);
   }
 }
 
 TEST(PluginGroupTest, DisabledByPolicy) {
   std::set<string16> disabled_plugins;
   disabled_plugins.insert(ASCIIToUTF16("Disable this!"));
@@ skipping 17 matching lines @@
   PluginGroupDefinition adobe_reader_plugin_def = {
       "adobe-reader", "Adobe Reader", "Adobe Acrobat",
       adobe_reader_version_range, arraysize(adobe_reader_version_range),
       "http://get.adobe.com/reader/" };
   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, 0);
+  group->AddPlugin(adobe_reader_plugin);
   PluginGroup group_copy(*group);  // Exercise the copy constructor.
   EXPECT_FALSE(group_copy.IsVulnerable());
 
   // 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),
       "http://www.microsoft.com/getsilverlight/" };
   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, 0);
+  group->AddPlugin(silverlight_plugin);
   EXPECT_FALSE(PluginGroup(*group).IsVulnerable());
 }
 }  // namespace npapi
 }  // namespace webkit