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

webkit/plugins/npapi/plugin_list_posix.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 <algorithm>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 146 matching lines @@
   // On my Ubuntu system, /usr/lib64 is a symlink to /usr/lib.
   // But a user reported on their Fedora system they are separate.
   plugin_dirs->push_back(FilePath("/usr/lib64/browser-plugins"));
   plugin_dirs->push_back(FilePath("/usr/lib64/mozilla/plugins"));
   plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
   plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
 #endif  // defined(ARCH_CPU_64_BITS)
 #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
 
   // Construct and stat a list of all filenames under consideration, for
   // later sorting by mtime.
   FileTimeList files;
   file_util::FileEnumerator enumerator(dir_path,
                                        false,  // not recursive
                                        file_util::FileEnumerator::FILES);
   for (FilePath path = enumerator.Next(); !path.value().empty();
        path = enumerator.Next()) {
     // Skip over Mozilla .xpt files.
     if (path.MatchesExtension(FILE_PATH_LITERAL(".xpt")))
       continue;
 
     // Java doesn't like being loaded through a symlink, since it uses
     // its path to find dependent data files.
     // file_util::AbsolutePath calls through to realpath(), which resolves
     // symlinks.
     FilePath orig_path = path;
     file_util::AbsolutePath(&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())
           << "Skipping blacklisted plugin " << path.value();
       continue;
     }
 
     // Flash stops working if the containing directory involves 'netscape'.
     // No joke.  So use the other path if it's better.
     static const char kFlashPlayerFilename[] = "libflashplayer.so";
@@ skipping 17 matching lines @@
       continue;
 
     files.push_back(std::make_pair(path, info.last_modified));
   }
 
   // Sort the file list by time (and filename).
   std::sort(files.begin(), files.end(), CompareTime);
 
   // 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);
   }
 }
 
 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
                                   ScopedVector<PluginGroup>* plugin_groups) {
   LOG_IF(ERROR, PluginList::DebugPluginLoading())
       << "Considering " << info.path.value() << " (" << info.name << ")";
 
   if (IsUndesirablePlugin(info)) {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
@@ skipping 19 matching lines @@
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
 
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit