Gracefully handle child process death in out-of-process plugin loading.

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 84 matching lines @@
                               const std::string& description,
                               const std::string& mime_type,
                               const PluginEntryPoints& entry_points);
 
   // Removes a specified internal plugin from the list. The search will match
   // on the path from the version info previously registered.
   //
   // This is generally only necessary for tests.
   void UnregisterInternalPlugin(const FilePath& path);
 
+  // Gets a list of all the registered internal plugins.
+  void GetInternalPlugins(std::vector<webkit::WebPluginInfo>* plugins);
+
   // Creates a WebPluginInfo structure given a plugin's path.  On success
   // returns true, with the information being put into "info".  If it's an
   // internal plugin, "entry_points" is filled in as well with a
   // internally-owned PluginEntryPoints pointer.
   // Returns false if the library couldn't be found, or if it's not a plugin.
   bool ReadPluginInfo(const FilePath& filename,
                       webkit::WebPluginInfo* info,
                       const PluginEntryPoints** entry_points);
 
   // In Windows plugins, the mime types are passed as a specially formatted list
@@ skipping 47 matching lines @@
   // If no such group exists, an empty string is returned.
   string16 GetPluginGroupName(const std::string& identifier);
 
   // Load a specific plugin with full path.
   void LoadPlugin(const FilePath& filename,
                   ScopedVector<PluginGroup>* plugin_groups);
 
   // The following functions are used to support probing for WebPluginInfo
   // using a different instance of this class.
 
-  // Returns the extra plugin paths, extra plugin directories, and internal
-  // plugin paths that should be loaded.
-  void GetPluginPathListsToLoad(
-      std::vector<FilePath>* extra_plugin_paths,
-      std::vector<FilePath>* extra_plugin_dirs,
-      std::vector<webkit::WebPluginInfo>* internal_plugins);
+  // Computes a list of all plugins to potentially load from all sources.
+  void GetPluginPathsToLoad(std::vector<FilePath>* plugin_paths);
 
   // Clears the internal list of PluginGroups and copies them from the vector.
   void SetPlugins(const std::vector<webkit::WebPluginInfo>& plugins);
 
   void set_will_load_plugins_callback(const base::Closure& callback);
 
   virtual ~PluginList();
 
  protected:
   // This constructor is used in unit tests to override the platform-dependent
@@ skipping 25 matching lines @@
   PluginGroup* CreatePluginGroup(
       const webkit::WebPluginInfo& web_plugin_info) const;
 
   // Implements all IO dependent operations of the LoadPlugins method so that
   // test classes can mock these out.
   virtual void LoadPluginsInternal(ScopedVector<PluginGroup>* plugin_groups);
 
   // Load all plugins from the default plugins directory.
   void LoadPlugins();
 
-  // Load all plugins from a specific directory.
-  // |plugin_groups| is updated with loaded plugin information.
-  // |visited_plugins| is updated with paths to all plugins that were considered
-  // (including those we didn't load).
-  void LoadPluginsFromDir(const FilePath& path,
-                          ScopedVector<PluginGroup>* plugin_groups,
-                          std::set<FilePath>* visited_plugins);
+  // Walks a directory and produces a list of all the plugins to potentially
+  // load in that directory.
+  void GetPluginsInDir(const FilePath& path, std::vector<FilePath>* 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);
 
   // Returns true if the plugin supports |mime_type|. |mime_type| should be all
   // lower case.
   bool SupportsType(const webkit::WebPluginInfo& plugin,
@@ skipping 16 matching lines @@
   void PlatformInit();
 
   //
   // Command-line switches
   //
 
 #if defined(OS_WIN)
   // true if we shouldn't load the new WMP plugin.
   bool dont_load_new_wmp_;
 
-  // Loads plugins registered under HKCU\Software\MozillaPlugins and
+  // Gets plugin paths registered under HKCU\Software\MozillaPlugins and
   // HKLM\Software\MozillaPlugins.
-  void LoadPluginsFromRegistry(ScopedVector<PluginGroup>* plugins,
-                               std::set<FilePath>* visited_plugins);
+  void GetPluginPathsFromRegistry(std::vector<FilePath>* plugins);
 #endif
 
   //
   // Internals
   //
 
   // If true, we reload plugins even if they've been loaded already.
   bool plugins_need_refresh_;
 
   // Extra plugin paths that we want to search when loading.
@@ skipping 26 matching lines @@
   // 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_