Ensure we don't load plugins on the IO thread

webkit/glue/plugins/plugin_list_mac.mm

 // Copyright (c) 2006-2009 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/glue/plugins/plugin_list.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/file_util.h"
 #include "base/mac_util.h"
@@ skipping 38 matching lines @@
   // Load from the user's area
   GetPluginCommonDirectory(plugin_dirs, true);
 
   // Load from the machine-wide area
   GetPluginCommonDirectory(plugin_dirs, false);
 
   // Load any bundled plugins
   GetPluginPrivateDirectory(plugin_dirs);
 }
 
-void PluginList::LoadPluginsFromDir(const FilePath &path) {
+void PluginList::LoadPluginsFromDir(const FilePath &path,
+                                    std::vector<WebPluginInfo>* plugins) {
   file_util::FileEnumerator enumerator(path,
                                        false, // not recursive
                                        file_util::FileEnumerator::DIRECTORIES);
   for (FilePath path = enumerator.Next(); !path.value().empty();
        path = enumerator.Next()) {
-    LoadPlugin(path);
+    LoadPlugin(path, plugins);
   }
 }
 
-bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) {
+bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
+                                  std::vector<WebPluginInfo>* plugins) {
   // The Gears plugin is Safari-specific, and causes crashes, so don't load it.
   for (std::vector<WebPluginMimeType>::const_iterator i =
            info.mime_types.begin(); i != info.mime_types.end(); ++i) {
     if (i->mime_type == "application/x-googlegears")
       return false;
   }
 
   // For now, only load plugins that we know are working reasonably well.
   // Anything using QuickDraw-based drawing, for example, would crash
   // immediately.
   std::string plugin_name = WideToUTF8(info.name);
   if (!(plugin_name == "WebKit Test PlugIn" ||  // Test plugin.
         plugin_name == "Shockwave Flash" ||     // CG drawing + Carbon events.
         plugin_name == "Picasa")) {             // No drawing or event handling.
     return false;
   }
 
   // Hierarchy check
   // (we're loading plugins hierarchically from Library folders, so plugins we
   //  encounter earlier must override plugins we encounter later)
-  for (size_t i = 0; i < plugins_.size(); ++i) {
-    if (plugins_[i].path.BaseName() == info.path.BaseName()) {
+  for (size_t i = 0; i < plugins->size(); ++i) {
+    if ((*plugins)[i].path.BaseName() == info.path.BaseName()) {
       return false;  // We already have a loaded plugin higher in the hierarchy.
     }
   }
 
   return true;
 }
 
-void PluginList::LoadInternalPlugins() {
+void PluginList::LoadInternalPlugins(std::vector<WebPluginInfo>* plugins) {
   // none for now
 }
 
 } // namespace NPAPI