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

webkit/plugins/npapi/plugin_list_posix.cc

Index: webkit/plugins/npapi/plugin_list_posix.cc
diff --git a/webkit/plugins/npapi/plugin_list_posix.cc b/webkit/plugins/npapi/plugin_list_posix.cc
index 7402aef1661ba680cb628558495ce6ba37140fa9..a7f8082733c6ce9f6d6eca8ce9e8eec16fff8e1c 100644
--- a/webkit/plugins/npapi/plugin_list_posix.cc
+++ b/webkit/plugins/npapi/plugin_list_posix.cc
@@ -164,9 +164,8 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
 #endif  // !defined(OS_CHROMEOS)
 }
 
-void PluginList::LoadPluginsFromDir(const FilePath& dir_path,
-                                    ScopedVector<PluginGroup>* plugin_groups,
-                                    std::set<FilePath>* visited_plugins) {
+void PluginList::GetPluginsInDir(
+    const FilePath& dir_path, std::vector<FilePath>* plugins) {
   // See ScanPluginsDirectory near
   // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginHostImpl.cpp#5052
 
@@ -191,12 +190,11 @@ void PluginList::LoadPluginsFromDir(const FilePath& dir_path,
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Resolved " << orig_path.value() << " -> " << path.value();
 
-    if (visited_plugins->find(path) != visited_plugins->end()) {
+    if (std::find(plugins->begin(), plugins->end(), path) != plugins->end()) {
       LOG_IF(ERROR, PluginList::DebugPluginLoading())
           << "Skipping duplicate instance of " << path.value();
       continue;
     }
-    visited_plugins->insert(path);
 
     if (IsBlacklistedPlugin(path)) {
       LOG_IF(ERROR, PluginList::DebugPluginLoading())
@@ -234,7 +232,7 @@ void PluginList::LoadPluginsFromDir(const FilePath& dir_path,
 
   // Load the files in order.
   for (FileTimeList::const_iterator i = files.begin(); i != files.end(); ++i) {
-    LoadPlugin(i->first, plugin_groups);
+    plugins->push_back(i->first);
   }
 }