Policy: Re-enabled plugin still disabled

webkit/plugins/npapi/plugin_list_unittest.cc

Index: webkit/plugins/npapi/plugin_list_unittest.cc
diff --git a/webkit/plugins/npapi/plugin_list_unittest.cc b/webkit/plugins/npapi/plugin_list_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7cbb207911637eb07416cefeb4935d30ce161684
--- /dev/null
+++ b/webkit/plugins/npapi/plugin_list_unittest.cc
@@ -0,0 +1,203 @@
+// 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_list.h"
+
+#include "base/utf_string_conversions.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace webkit {
+namespace npapi {
+
+namespace plugin_test_internal {
+
+// A PluginList for tests that avoids file system IO. There is also no reason
+// to use |lock_| (but it doesn't hurt either).
+class PluginListWithoutFileIO : public PluginList {
+ public:
+  void CreatePluginGroup(const PluginGroupDefinition& definition) {
+    PluginGroup* group = PluginGroup::FromPluginGroupDefinition(definition);
+    ProcessGroupAfterInitialize(group);
+    plugin_groups_.push_back(group);
+  }
+
+  void LoadDummyPlugin(WebPluginInfo* plugin) {
+    // EnforceGroupPolicy will force the groups' enabled field to be correctly
+    // intialized.
+    AddToPluginGroups(*plugin, &plugin_groups_);
+  }
+
+  // NPAPI::PluginList methods:
+
+  virtual void LoadPlugins(bool refresh) {
+    if (plugins_loaded_ && !refresh)
+      return;
+
+    for (size_t i = 0; i < plugins_to_load_.size(); ++i)
+      LoadDummyPlugin(&plugins_to_load_[i]);

[Bernhard Bauer, 2011/01/21 17:29:37]

Can't you just directly call AddToPluginGroups?

[pastarmovj, 2011/01/24 10:47:31]

Done.

+
+    plugins_loaded_ = true;
+  }
+
+  virtual void ProcessGroupAfterInitialize(PluginGroup* group) {
+  }
+
+  std::vector<WebPluginInfo> plugins_to_load_;
+};
+
+}  // namespace plugin_test_internal
+
+namespace {
+
+bool Equals(const WebPluginInfo& a, const WebPluginInfo& b,
+            bool care_about_enabled_status) {
+  return (a.name == b.name &&
+          a.path == b.path &&
+          a.version == b.version &&
+          a.desc == b.desc &&
+          (!care_about_enabled_status || a.enabled == b.enabled));
+}
+
+bool Contains(const std::vector<WebPluginInfo>& list,
+              const WebPluginInfo& plugin,
+              bool care_about_enabled_status) {
+  for (std::vector<WebPluginInfo>::const_iterator it = list.begin();
+       it != list.end(); ++it) {
+    if (Equals(*it, plugin, care_about_enabled_status))
+      return true;
+  }
+  return false;
+}
+
+}  // namespace
+
+class PluginListTest : public testing::Test {
+ public:
+  PluginListTest()
+      : foo_plugin_(ASCIIToUTF16("Foo Plugin"),
+                    FilePath(FILE_PATH_LITERAL("/plugins/foo.plugin")),
+                    ASCIIToUTF16("1.2.3"),
+                    ASCIIToUTF16("foo")),
+        bar_plugin_(ASCIIToUTF16("Bar Plugin"),
+                    FilePath(FILE_PATH_LITERAL("/plugins/bar.plugin")),
+                    ASCIIToUTF16("2.3.4"),
+                    ASCIIToUTF16("bar")) {
+  }
+
+  virtual void SetUp() {
+    bar_plugin_.enabled = WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
+    plugin_list_.DisablePlugin(bar_plugin_.path);
+    plugin_list_.plugins_to_load_.push_back(foo_plugin_);
+    plugin_list_.plugins_to_load_.push_back(bar_plugin_);
+    plugin_list_.LoadPlugins(true);
+  }
+
+ protected:
+  plugin_test_internal::PluginListWithoutFileIO plugin_list_;
+  WebPluginInfo foo_plugin_;
+  WebPluginInfo bar_plugin_;
+};
+
+TEST_F(PluginListTest, GetPlugins) {
+  std::vector<WebPluginInfo> plugins;
+  plugin_list_.GetPlugins(false, &plugins);
+  EXPECT_EQ(2u, plugins.size());
+  EXPECT_TRUE(Contains(plugins, foo_plugin_, true));
+  EXPECT_TRUE(Contains(plugins, bar_plugin_, true));
+}
+
+TEST_F(PluginListTest, GetEnabledPlugins) {
+  std::vector<WebPluginInfo> plugins;
+  plugin_list_.GetEnabledPlugins(false, &plugins);
+  EXPECT_EQ(1u, plugins.size());
+  EXPECT_TRUE(Contains(plugins, foo_plugin_, true));
+}
+
+TEST_F(PluginListTest, GetPluginGroup) {
+  const PluginGroup* foo_group = plugin_list_.GetPluginGroup(foo_plugin_);
+  EXPECT_EQ(foo_group->GetGroupName(), foo_plugin_.name);
+  EXPECT_TRUE(foo_group->Enabled());
+  // The second request should return a pointer to the same instance.
+  const PluginGroup* foo_group2 = plugin_list_.GetPluginGroup(foo_plugin_);
+  EXPECT_EQ(foo_group, foo_group2);
+  const PluginGroup* bar_group = plugin_list_.GetPluginGroup(bar_plugin_);
+  EXPECT_FALSE(bar_group->Enabled());
+}
+
+TEST_F(PluginListTest, EnableDisablePlugin) {
+  // Disable "foo" plugin.
+  plugin_list_.DisablePlugin(foo_plugin_.path);
+  std::vector<WebPluginInfo> plugins;
+  plugin_list_.GetEnabledPlugins(false, &plugins);
+  EXPECT_FALSE(Contains(plugins, foo_plugin_, false));
+  const PluginGroup* foo_group = plugin_list_.GetPluginGroup(foo_plugin_);
+  EXPECT_FALSE(foo_group->Enabled());
+  // Enable "bar" plugin.
+  plugin_list_.EnablePlugin(bar_plugin_.path);
+  plugin_list_.GetEnabledPlugins(false, &plugins);
+  EXPECT_TRUE(Contains(plugins, bar_plugin_, false));
+  const PluginGroup* bar_group = plugin_list_.GetPluginGroup(bar_plugin_);
+  EXPECT_TRUE(bar_group->Enabled());
+}
+
+TEST_F(PluginListTest, EnableGroup) {
+  // Disable "foo" plugin group.
+  const PluginGroup* foo_group = plugin_list_.GetPluginGroup(foo_plugin_);
+  EXPECT_TRUE(foo_group->Enabled());
+  EXPECT_TRUE(plugin_list_.EnableGroup(false, foo_group->GetGroupName()));
+  EXPECT_FALSE(foo_group->Enabled());
+  std::vector<WebPluginInfo> plugins;
+  plugin_list_.GetEnabledPlugins(false, &plugins);
+  EXPECT_EQ(0u, plugins.size());
+  EXPECT_FALSE(Contains(plugins, foo_plugin_, false));
+  // Enable "bar" plugin group.
+  const PluginGroup* bar_group = plugin_list_.GetPluginGroup(bar_plugin_);
+  EXPECT_FALSE(bar_group->Enabled());
+  plugin_list_.EnableGroup(true, bar_group->GetGroupName());
+  EXPECT_TRUE(bar_group->Enabled());
+  plugin_list_.GetEnabledPlugins(false, &plugins);
+  EXPECT_TRUE(Contains(plugins, bar_plugin_, false));
+}
+
+TEST_F(PluginListTest, EmptyGroup) {
+  std::vector<PluginGroup> groups;
+  plugin_list_.GetPluginGroups(false, &groups);
+  for (size_t i = 0; i < groups.size(); ++i) {
+    EXPECT_GE(1U, groups[i].web_plugins_info().size());
+  }
+}
+
+TEST_F(PluginListTest, DisableOutdated) {
+  VersionRangeDefinition version_range[] = {
+      { "0", "4", "3.0.44" },
+      { "4", "5", "" }
+  };
+  PluginGroupDefinition plugin_def = {
+      "myplugin-34", "MyPlugin 3/4", "MyPlugin", version_range,
+      arraysize(version_range), "http://latest" };
+  WebPluginInfo plugin_3043(ASCIIToUTF16("MyPlugin"),
+                            FilePath(FILE_PATH_LITERAL("/myplugin.3.0.43")),
+                            ASCIIToUTF16("3.0.43"),
+                            ASCIIToUTF16("MyPlugin version 3.0.43"));
+  WebPluginInfo plugin_3045(ASCIIToUTF16("MyPlugin"),
+                            FilePath(FILE_PATH_LITERAL("/myplugin.3.0.45")),
+                            ASCIIToUTF16("3.0.45"),
+                            ASCIIToUTF16("MyPlugin version 3.0.45"));
+  plugin_list_.plugins_to_load_.clear();
+  plugin_list_.plugins_to_load_.push_back(plugin_3043);
+  plugin_list_.plugins_to_load_.push_back(plugin_3045);
+  plugin_list_.CreatePluginGroup(plugin_def);
+  plugin_list_.LoadPlugins(true);
+  const PluginGroup* group_3043 = plugin_list_.GetPluginGroup(plugin_3043);
+  const PluginGroup* group_3045 = plugin_list_.GetPluginGroup(plugin_3045);
+  EXPECT_EQ(group_3043, group_3045);
+  EXPECT_EQ(plugin_3043.desc, group_3043->description());
+  EXPECT_TRUE(group_3043->IsVulnerable());
+  const_cast<PluginGroup*>(group_3043)->DisableOutdatedPlugins();
+  EXPECT_EQ(plugin_3045.desc, group_3043->description());
+  EXPECT_FALSE(group_3043->IsVulnerable());
+}
+
+}  // namespace npapi
+}  // namespace webkit