PluginList cleanup

webkit/plugins/npapi/plugin_list_unittest.cc

 // Copyright (c) 2011 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"
 #include "webkit/plugins/npapi/mock_plugin_list.h"
 
@@ skipping 56 matching lines @@
   }
 
  protected:
   MockPluginList plugin_list_;
   WebPluginInfo foo_plugin_;
   WebPluginInfo bar_plugin_;
 };
 
 TEST_F(PluginListTest, GetPlugins) {
   std::vector<WebPluginInfo> plugins;
-  plugin_list_.GetPlugins(false, &plugins);
+  plugin_list_.GetPlugins(&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(ASCIIToUTF16(kFooGroupName), foo_group->GetGroupName());
   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", "" }
   };
   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_.ClearPluginsToLoad();
   plugin_list_.AddPluginToLoad(plugin_3043);
   plugin_list_.AddPluginToLoad(plugin_3045);
   // Enfore the load to run.
+  plugin_list_.RefreshPlugins();
   std::vector<WebPluginInfo> plugins;
-  plugin_list_.GetPlugins(true, &plugins);
+  plugin_list_.GetPlugins(&plugins);
   PluginGroup* group_3043 =
       const_cast<PluginGroup*>(plugin_list_.GetPluginGroup(plugin_3043));
   const PluginGroup* group_3045 = plugin_list_.GetPluginGroup(plugin_3045);
   EXPECT_EQ(group_3043, group_3045);
   group_3043->version_ranges_.push_back(VersionRange(version_range[0]));
   group_3043->version_ranges_.push_back(VersionRange(version_range[1]));
   EXPECT_EQ(plugin_3043.desc, group_3043->description());
   EXPECT_TRUE(group_3043->IsVulnerable());
   group_3043->DisableOutdatedPlugins();
   EXPECT_EQ(plugin_3045.desc, group_3043->description());
   EXPECT_FALSE(group_3043->IsVulnerable());
 }
 
 TEST_F(PluginListTest, BadPluginDescription) {
   WebPluginInfo plugin_3043(ASCIIToUTF16(""),
                             FilePath(FILE_PATH_LITERAL("/myplugin.3.0.43")),
                             ASCIIToUTF16(""),
                             ASCIIToUTF16(""));
   // Simulate loading of the plugins.
   plugin_list_.ClearPluginsToLoad();
   plugin_list_.AddPluginToLoad(plugin_3043);
   // Now we should have them in the state we specified above.
+  plugin_list_.RefreshPlugins();
   std::vector<WebPluginInfo> plugins;
-  plugin_list_.GetPlugins(true, &plugins);
+  plugin_list_.GetPlugins(&plugins);
   ASSERT_TRUE(Contains(plugins, plugin_3043, true));
 }
 
 TEST_F(PluginListTest, DisableAndEnableBeforeLoad) {
   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"));
   // Disable the first one and disable and then enable the second one.
   EXPECT_TRUE(plugin_list_.DisablePlugin(plugin_3043.path));
   EXPECT_TRUE(plugin_list_.DisablePlugin(plugin_3045.path));
   EXPECT_TRUE(plugin_list_.EnablePlugin(plugin_3045.path));
   // Simulate loading of the plugins.
   plugin_list_.ClearPluginsToLoad();
   plugin_list_.AddPluginToLoad(plugin_3043);
   plugin_list_.AddPluginToLoad(plugin_3045);
   // Now we should have them in the state we specified above.
+  plugin_list_.RefreshPlugins();
   std::vector<WebPluginInfo> plugins;
-  plugin_list_.GetPlugins(true, &plugins);
+  plugin_list_.GetPlugins(&plugins);
   plugin_3043.enabled = WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
   ASSERT_TRUE(Contains(plugins, plugin_3043, true));
   ASSERT_TRUE(Contains(plugins, plugin_3045, true));
 }
 
 TEST_F(PluginListTest, HardcodedGroups) {
   std::vector<PluginGroup> groups;
   plugin_list_.GetPluginGroups(true, &groups);
   ASSERT_EQ(2u, groups.size());
   EXPECT_TRUE(groups[0].Enabled());
   EXPECT_EQ(1u, groups[0].web_plugins_info().size());
   EXPECT_TRUE(groups[0].ContainsPlugin(FilePath(kFooPath)));
   EXPECT_EQ(kFooIdentifier, groups[0].identifier());
   EXPECT_FALSE(groups[1].Enabled());
   EXPECT_EQ(1u, groups[1].web_plugins_info().size());
   EXPECT_TRUE(groups[1].ContainsPlugin(FilePath(kBarPath)));
   EXPECT_EQ("bar.plugin", groups[1].identifier());
 }
 
 TEST_F(PluginListTest, DisableBeforeLoad) {
   // Test that a plugin group that was disabled before plugins are loaded stays
   // disabled afterwards.
 
   EXPECT_TRUE(plugin_list_.EnableGroup(false, ASCIIToUTF16(kFooGroupName)));
 
+  plugin_list_.RefreshPlugins();
   std::vector<WebPluginInfo> plugins;
-  plugin_list_.GetPlugins(true, &plugins);
+  plugin_list_.GetPlugins(&plugins);
   ASSERT_EQ(2u, plugins.size());
   ASSERT_EQ(WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED, plugins[0].enabled);
 }
 
 }  // namespace npapi
 }  // namespace webkit