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

webkit/plugins/npapi/plugin_list_win.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 <tchar.h>
 
 #include <set>
 
@@ skipping 249 matching lines @@
   // Firefox hard-codes the paths of some popular plugins to ensure that
   // the plugins are found.  We are going to copy this as well.
   GetAcrobatDirectory(&dirs);
   GetQuicktimeDirectory(&dirs);
   GetWindowsMediaDirectory(&dirs);
 
   for (std::set<FilePath>::iterator i = dirs.begin(); i != dirs.end(); ++i)
     plugin_dirs->push_back(*i);
 }
 
-void PluginList::LoadPluginsFromDir(const FilePath &path,
-                                    ScopedVector<PluginGroup>* plugin_groups,
-                                    std::set<FilePath>* visited_plugins) {
+void PluginList::GetPluginsInDir(
+    const FilePath& path, std::vector<FilePath>* plugins) {
   WIN32_FIND_DATA find_file_data;
   HANDLE find_handle;
 
   std::wstring dir = path.value();
   // FindFirstFile requires that you specify a wildcard for directories.
   dir.append(L"\\NP*.DLL");
 
   find_handle = FindFirstFile(dir.c_str(), &find_file_data);
   if (find_handle == INVALID_HANDLE_VALUE)
     return;
 
   do {
     if (!(find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
       FilePath filename = path.Append(find_file_data.cFileName);
-      LoadPlugin(filename, plugin_groups);
-      visited_plugins->insert(filename);
+      plugins->push_back(filename);
     }
   } while (FindNextFile(find_handle, &find_file_data) != 0);
 
   DCHECK(GetLastError() == ERROR_NO_MORE_FILES);
   FindClose(find_handle);
 }
 
-void PluginList::LoadPluginsFromRegistry(
-    ScopedVector<PluginGroup>* plugin_groups,
-    std::set<FilePath>* visited_plugins) {
+void PluginList::GetPluginPathsFromRegistry(std::vector<FilePath>* plugins) {
   std::set<FilePath> plugin_dirs;
 
   GetPluginsInRegistryDirectory(
       HKEY_CURRENT_USER, kRegistryMozillaPlugins, &plugin_dirs);
   GetPluginsInRegistryDirectory(
       HKEY_LOCAL_MACHINE, kRegistryMozillaPlugins, &plugin_dirs);
 
   for (std::set<FilePath>::iterator i = plugin_dirs.begin();
        i != plugin_dirs.end(); ++i) {
-    LoadPlugin(*i, plugin_groups);
-    visited_plugins->insert(*i);
+    plugins->push_back(*i);
   }
 }
 
 // Returns true if the given plugins share at least one mime type.  This is used
 // to differentiate newer versions of a plugin vs two plugins which happen to
 // have the same filename.
 bool HaveSharedMimeType(const webkit::WebPluginInfo& plugin1,
                         const webkit::WebPluginInfo& plugin2) {
   for (size_t i = 0; i < plugin1.mime_types.size(); ++i) {
     for (size_t j = 0; j < plugin2.mime_types.size(); ++j) {
@@ skipping 129 matching lines @@
 
     if (file_util::PathExists(info.path) && (!IsValid32BitImage(info.path)))
       load_plugin = false;
     break;
   }
   return load_plugin;
 }
 
 }  // namespace npapi
 }  // namespace webkit