Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo.

webkit/plugins/npapi/plugin_list.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 132 matching lines @@
 
   // Get plugin info by plugin path (including disabled plugins). Returns true
   // if the plugin is found and WebPluginInfo has been filled in |info|.
   bool GetPluginInfoByPath(const FilePath& plugin_path,
                            webkit::WebPluginInfo* info);
 
   // Populates the given vector with all available plugin groups.
   void GetPluginGroups(bool load_if_necessary,
                        std::vector<PluginGroup>* plugin_groups);
 
-  // Returns the PluginGroup corresponding to the given WebPluginInfo. If no
-  // such group exists, it is created and added to the cache.
-  // Beware: when calling this from the Browser process, the group that the
-  // returned pointer points to might disappear suddenly. This happens when
-  // |RefreshPlugins()| is called and then |LoadPlugins()| is triggered by a
-  // call to |GetPlugins()|, |GetEnabledPlugins()|, |GetPluginInfoArray()|,
-  // |GetPluginInfoByPath()|, or |GetPluginGroups(true, _)|. It is the caller's
-  // responsibility to make sure this doesn't happen.
-  const PluginGroup* GetPluginGroup(
-      const webkit::WebPluginInfo& web_plugin_info);
+  // Returns a copy of the PluginGroup corresponding to the given WebPluginInfo.
+  // If no such group exists, it is created and added to the cache.
+  // The caller takes ownership of the returned PluginGroup.
+  PluginGroup* GetPluginGroup(const webkit::WebPluginInfo& web_plugin_info);
 
   // Returns the name of the PluginGroup with the given identifier.
   // If no such group exists, an empty string is returned.
   string16 GetPluginGroupName(const std::string& identifier);
 
   // Returns the identifier string of the PluginGroup corresponding to the given
   // WebPluginInfo. If no such group exists, it is created and added to the
   // cache.
   std::string GetPluginGroupIdentifier(
       const webkit::WebPluginInfo& web_plugin_info);
 
   // Load a specific plugin with full path.
   void LoadPlugin(const FilePath& filename,
                   ScopedVector<PluginGroup>* plugin_groups);
 
-  // Enable a specific plugin, specified by path. Returns |true| iff a plugin
-  // currently in the plugin list was actually enabled as a result; regardless
-  // of return value, if a plugin is found in the future with the given name, it
-  // will be enabled.
-  bool EnablePlugin(const FilePath& filename);
-
-  // Disable a specific plugin, specified by path. Returns |true| iff a plugin
-  // currently in the plugin list was actually disabled as a result; regardless
-  // of return value, if a plugin is found in the future with the given name, it
-  // will be disabled.
-  bool DisablePlugin(const FilePath& filename);
-
-  // Enable/disable a plugin group, specified by group_name.  Returns |true| iff
-  // a plugin currently in the plugin list was actually enabled/disabled as a
-  // result; regardless of return value, if a plugin is found in the future with
-  // the given name, it will be enabled/disabled.
-  bool EnableGroup(bool enable, const string16& name);
-
   virtual ~PluginList();
 
  protected:
   // This constructor is used in unit tests to override the platform-dependent
   // real-world plugin group definitions with custom ones.
   PluginList(const PluginGroupDefinition* definitions, size_t num_definitions);
 
   // Adds the given WebPluginInfo to its corresponding group, creating it if
   // necessary, and returns the group.
   // Callers need to protect calls to this method by a lock themselves.
@@ skipping 27 matching lines @@
   void LoadPluginsFromDir(const FilePath& path,
                           ScopedVector<PluginGroup>* plugin_groups,
                           std::set<FilePath>* visited_plugins);
 
   // Returns true if we should load the given plugin, or false otherwise.
   // plugins is the list of plugins we have crawled in the current plugin
   // loading run.
   bool ShouldLoadPlugin(const webkit::WebPluginInfo& info,
                         ScopedVector<PluginGroup>* plugins);
 
-  // Return whether a plug-in group with the given name should be disabled,
-  // either because it already is on the list of disabled groups, or because it
-  // is blacklisted by a policy. In the latter case, add the plugin group to the
-  // list of disabled groups as well.
-  bool ShouldDisableGroup(const string16& group_name);
-
   // Returns true if the plugin supports |mime_type|. |mime_type| should be all
   // lower case.
   bool SupportsType(const webkit::WebPluginInfo& plugin,
                     const std::string& mime_type,
                     bool allow_wildcard);
 
   // Returns true if the given plugin supports a given file extension.
   // |extension| should be all lower case. If |mime_type| is not NULL, it will
   // be set to the MIME type if found. The MIME type which corresponds to the
   // extension is optionally returned back.
@@ skipping 42 matching lines @@
   // Holds information about internal plugins.
   std::vector<InternalPlugin> internal_plugins_;
 
   // Hardcoded plugin group definitions.
   const PluginGroupDefinition* const group_definitions_;
   const size_t num_group_definitions_;
 
   // Holds the currently available plugin groups.
   ScopedVector<PluginGroup> plugin_groups_;
 
-  // The set of plugins that have been scheduled for disabling once they get
-  // loaded. This list is used in LoadPlugins and pruned after it. Contains
-  // plugins that were either disabled by the user (prefs are loaded before
-  // plugins) or disabled by a policy.
-  std::set<FilePath> plugins_to_disable_;
-  // Equivalent to the |plugins_to_disable_| this is the set of groups
-  // scheduled for disabling once they appear. This list is never completely
-  // pruned but all groups that do get created are removed from it. New groups
-  // might get added if they should be pruned because of plugins getting removed
-  // for example.
-  std::set<string16> groups_to_disable_;
-
   // Need synchronization for the above members since this object can be
   // accessed on multiple threads.
   base::Lock lock_;
 
   // Set to true if the default plugin is enabled.
   bool default_plugin_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginList);
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_