Fix layout test failures. Looks like keying the plugins based on OriginalFil...

webkit/glue/plugins/plugin_list.h

 // Copyright (c) 2006-2008 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.
 
 // TODO: Need mechanism to cleanup the static instance
 
 #ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__
 #define WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__
 
+#include <set>
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
-#include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #include "webkit/glue/webplugin.h"
 
 class GURL;
 
 namespace NPAPI
 {
 
 // Used by plugins_test when testing the older WMP plugin to force the new
 // plugin to not get loaded.
@@ skipping 56 matching lines @@
   bool GetPluginInfoByPath(const FilePath& plugin_path,
                            WebPluginInfo* info);
  private:
   // Constructors are private for singletons
   PluginList();
 
   // Load all plugins from the default plugins directory
   void LoadPlugins(bool refresh);
 
   // Load all plugins from a specific directory
-  void LoadPlugins(const FilePath& path);
+  void LoadPluginsFromDir(const FilePath& path);

[Avi (use Gerrit), 2009/01/13 14:51:37]

Too late now, but why abbrev here when we don't abbreviate "directory" in other
function names?

 
   // Load a specific plugin with full path.
   void LoadPlugin(const FilePath& filename);
 
   // Returns true if we should load the given plugin, or false otherwise.
-  bool ShouldLoadPlugin(const std::string& filename);
+  bool ShouldLoadPlugin(const FilePath& path);
 
   // Load internal plugins. Right now there is only one: activex_shim.
   void LoadInternalPlugins();
 
   // Find a plugin by mime type, and clsid.
   // If clsid is empty, we will just find the plugin that supports mime type.
   // Otherwise, if mime_type is application/x-oleobject etc that's supported by
   // by our activex shim, we need to check if the specified ActiveX exists. 
   // If not we will not return the activex shim, instead we will let the
   // default plugin handle activex installation.
@@ skipping 15 matching lines @@
   // Returns true if the given WebPluginInfo supports a given file extension.
   // extension should be all lower case.
   // If mime_type is not NULL, it will be set to the mime type if found.
   // The mime type which corresponds to the extension is optionally returned
   // back.
   static bool SupportsExtension(const WebPluginInfo& info,
                                 const std::string &extension,
                                 std::string* actual_mime_type);
 
   // The application path where we expect to find plugins.
-  static FilePath GetPluginAppDirectory();
+  static void GetAppDirectory(std::set<FilePath>* plugin_dirs);
 
   // The executable path where we expect to find plugins.
-  static FilePath GetPluginExeDirectory();
+  static void GetExeDirectory(std::set<FilePath>* plugin_dirs);
 
-  // Load plugins from the Firefox install path.  This is kind of
-  // a kludge, but it helps us locate the flash player for users that
+  // Get plugin directory locations from the Firefox install path.  This is kind
+  // of a kludge, but it helps us locate the flash player for users that
   // already have it for firefox.  Not having to download yet-another-plugin
   // is a good thing.
-  void LoadFirefoxPlugins();
+  void GetFirefoxDirectory(std::set<FilePath>* plugin_dirs);
 
-  // Hardcoded logic to detect and load acrobat plugins
-  void LoadAcrobatPlugins();
+  // Hardcoded logic to detect Acrobat plugins locations.
+  void GetAcrobatDirectory(std::set<FilePath>* plugin_dirs);
 
-  // Hardcoded logic to detect and load quicktime plugins
-  void LoadQuicktimePlugins();
+  // Hardcoded logic to detect QuickTime plugin location.
+  void GetQuicktimeDirectory(std::set<FilePath>* plugin_dirs);
 
-  // Hardcoded logic to detect and load Windows Media Player plugins
-  void LoadWindowsMediaPlugins();
+  // Hardcoded logic to detect Windows Media Player plugin location.
+  void GetWindowsMediaDirectory(std::set<FilePath>* plugin_dirs);
 
-  // Hardcoded logic to detect and load Java plugins
-  void LoadJavaPlugin();
+  // Hardcoded logic to detect Java plugin location.
+  void GetJavaDirectory(std::set<FilePath>* plugin_dirs);
 
 #if defined(OS_WIN)
-  // Search the registry at the given path and load plugins listed there.
-  void LoadPluginsInRegistryFolder(HKEY root_key,
-                                   const std::wstring& registry_folder);
+  // Search the registry at the given path and detect plugin directories.
+  void GetPluginsInRegistryDirectory(HKEY root_key,
+                                     const std::wstring& registry_folder,
+                                     std::set<FilePath>* plugin_dirs);
 #endif
 
   // true if we shouldn't load the new WMP plugin.
   bool dont_load_new_wmp_;
 
   bool use_internal_activex_shim_;
 
   static scoped_refptr<PluginList> singleton_;
   bool plugins_loaded_;
 
-  // Maps from the name of the plugin file (NOT path) to WebPluginInfo.
-  typedef base::hash_map<std::string, WebPluginInfo> PluginMap;
-  PluginMap plugins_;
+  // Contains information about the available plugins.
+  std::vector<WebPluginInfo> plugins_;
 
   DISALLOW_EVIL_CONSTRUCTORS(PluginList);
 };
 
 } // namespace NPAPI
 
 #endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__