PluginList: Unit tests and bugfixes

webkit/glue/plugins/plugin_group.h

 // 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.
 
 #ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
 #define WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
 #pragma once
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 
 class DictionaryValue;
 class FilePath;
 class Version;
 struct WebPluginInfo;
 
 namespace NPAPI {
 class PluginList;
 };
+namespace plugin_test_internal {
+class TestablePluginList;
+}
 
 // Hard-coded version ranges for plugin groups.
 struct VersionRangeDefinition {
   // Matcher for lowest version matched by this range (inclusive). May be empty
   // to match everything iff |version_matcher_high| is also empty.
   const char* version_matcher_low;
   // Matcher for highest version matched by this range (exclusive). May be empty
   // to match anything higher than |version_matcher_low|.
   const char* version_matcher_high;
   const char* min_version;  // Minimum secure version.
@@ skipping 65 matching lines @@
   // plugin as given by PluginList so we can display its priority.
   // Retuns true if plugin has been added and false if it was already added.
   WebPluginInfo* AddPlugin(const WebPluginInfo& plugin, int position);
 
   // Returns a poitner to the plugin at the end of the |web_plugin_infos_|
   // array.
   std::list<WebPluginInfo>& GetPlugins();
 
   // Returns the positions of the plugins in the group.
   std::vector<int>& GetPluginPositions();
 

[danno, 2010/12/15 10:42:12]

following should be const method?

[Jakob Kummerow, 2010/12/15 18:03:27]

Done.

+  bool IsEmpty();
+
   // Enables/disables this group. This enables/disables all plugins in the
   // group.
   void Enable(bool enable);
 
   // Refreshes the enabled flag based on the state of its plugins.
   void RefreshEnabledState();
 
   // Returns whether the plugin group is enabled or not.
   bool Enabled() const { return enabled_; }
 
@@ skipping 22 matching lines @@
   bool IsVulnerable() const;
 
   // Disables all plugins in this group that are older than the
   // minimum version.
   void DisableOutdatedPlugins();
 
  private:
   typedef std::map<std::string, PluginGroup*> PluginMap;
 
   friend class NPAPI::PluginList;
+  friend class plugin_test_internal::TestablePluginList;
   friend class PluginGroupTest;
   friend class TableModelArrayControllerTest;
   friend class PluginExceptionsTableModelTest;
 
   // Generates the (short) identifier string for the given plugin.
   static std::string GetIdentifier(const WebPluginInfo& wpi);
 
   // Generates the long identifier (based on the full file path) for the given
   // plugin, to be called when the short identifier is not unique.
   static std::string GetLongIdentifier(const WebPluginInfo& wpi);
@@ skipping 26 matching lines @@
   Version* CreateVersionFromString(const string16& version_string);
 
   // Set the description and version for this plugin group from the
   // given plug-in.
   void UpdateDescriptionAndVersion(const WebPluginInfo& plugin);
 
   // Updates the active plugin in the group. The active plugin is the first
   // enabled one, or if all plugins are disabled, simply the first one.
   void UpdateActivePlugin(const WebPluginInfo& plugin);
 
+  // Used by tests to override the default PluginList singleton.
+  NPAPI::PluginList* GetPluginList();
+
   static std::set<string16>* policy_disabled_plugin_patterns_;
 
   std::string identifier_;
   string16 group_name_;
   string16 name_matcher_;
   string16 description_;
   std::string update_url_;
   bool enabled_;
   std::vector<VersionRange> version_ranges_;
   scoped_ptr<Version> version_;
   std::list<WebPluginInfo> web_plugin_infos_;
   std::vector<int> web_plugin_positions_;
+  NPAPI::PluginList* plugin_list_;
 };
 
 #endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_