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

webkit/glue/plugins/plugin_lib.cc

 // 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.
 
 #include "config.h"
 
 #include "webkit/glue/plugins/plugin_lib.h"
 
 #include "base/file_util.h"
 #include "base/file_version_info.h"
@@ skipping 15 matching lines @@
 
 
 namespace NPAPI
 {
 
 const char kPluginLibrariesLoadedCounter[] = "PluginLibrariesLoaded";
 const char kPluginInstancesActiveCounter[] = "PluginInstancesActive";
 
 static const InternalPluginInfo g_internal_plugins[] = {
   {
-    {kActiveXShimFileName,
-     kActiveXShimFileName,
+    {FilePath(kActiveXShimFileName),
      L"ActiveX Plug-in",
      L"ActiveX Plug-in provides a shim to support ActiveX controls",
      L"1, 0, 0, 1",
      L"application/x-oleobject|application/oleobject",
      L"*|*",
      L""
     },
     activex_shim::ActiveX_Shim_NP_GetEntryPoints,
     activex_shim::ActiveX_Shim_NP_Initialize,
     activex_shim::ActiveX_Shim_NP_Shutdown
   },
   {
-    {kActivexShimFileNameForMediaPlayer,
-     kActivexShimFileNameForMediaPlayer,
+    {FilePath(kActivexShimFileNameForMediaPlayer),
      kActivexShimFileNameForMediaPlayer,
      L"Windows Media Player",
      L"1, 0, 0, 1",
      L"application/x-ms-wmp|application/asx|video/x-ms-asf-plugin|"
          L"application/x-mplayer2|video/x-ms-asf|video/x-ms-wm|audio/x-ms-wma|"
          L"audio/x-ms-wax|video/x-ms-wmv|video/x-ms-wvx",
      L"*|*|*|*|asf,asx,*|wm,*|wma,*|wax,*|wmv,*|wvx,*",
      L""
     },
     activex_shim::ActiveX_Shim_NP_GetEntryPoints,
     activex_shim::ActiveX_Shim_NP_Initialize,
     activex_shim::ActiveX_Shim_NP_Shutdown
   },
   {
-    {kDefaultPluginLibraryName,
-     kDefaultPluginLibraryName,
+    {FilePath(kDefaultPluginLibraryName),
      L"Default Plug-in",
      L"Provides functionality for installing third-party plug-ins",
      L"1, 0, 0, 1",
      L"*",
      L"",
      L""
     },
     default_plugin::NP_GetEntryPoints,
     default_plugin::NP_Initialize,
     default_plugin::NP_Shutdown
@@ skipping 44 matching lines @@
     : web_plugin_info_(info),
       module_(0),
       initialized_(false),
       saved_data_(0),
       instance_count_(0) {
   StatsCounter(kPluginLibrariesLoadedCounter).Increment();
   memset((void*)&plugin_funcs_, 0, sizeof(plugin_funcs_));
   g_loaded_libs->push_back(this);
 
   internal_ = false;
-  std::wstring wide_filename = UTF8ToWide(info.filename);
   for (int i = 0; i < arraysize(g_internal_plugins); ++i) {
-    if (wide_filename == g_internal_plugins[i].version_info.filename) {
+    if (info.path == g_internal_plugins[i].version_info.path) {
       internal_ = true;
       NP_Initialize_ = g_internal_plugins[i].np_initialize;
       NP_GetEntryPoints_ = g_internal_plugins[i].np_getentrypoints;
       NP_Shutdown_ = g_internal_plugins[i].np_shutdown;
       break;
     }
   }
 }
 
 PluginLib::~PluginLib() {
@@ skipping 193 matching lines @@
   SplitString(base::SysWideToNativeMB(pvi.mime_types), '|', &mime_types);
   SplitString(base::SysWideToNativeMB(pvi.file_extents), '|', &file_extensions);
   SplitString(pvi.file_open_names, '|', &descriptions);
 
   if (mime_types.empty())
     return false;
 
   info->name = pvi.product_name;
   info->desc = pvi.file_description;
   info->version = pvi.file_version;
-  info->filename = WideToUTF8(pvi.filename);
   info->path = FilePath(pvi.path);
 
   for (size_t i = 0; i < mime_types.size(); ++i) {
     WebPluginMimeType mime_type;
     mime_type.mime_type = StringToLowerASCII(mime_types[i]);
     if (file_extensions.size() > i)
       SplitString(file_extensions[i], ',', &mime_type.file_extensions);
 
     if (descriptions.size() > i) {
       mime_type.description = descriptions[i];
@@ skipping 11 matching lines @@
     info->mime_types.push_back(mime_type);
   }
 
   return true;
 }
 
 
  bool PluginLib::ReadWebPluginInfo(const FilePath &filename,
                                    WebPluginInfo* info) {
   for (int i = 0; i < arraysize(g_internal_plugins); ++i) {
-    if (filename.value() == g_internal_plugins[i].version_info.filename)
+    if (filename == g_internal_plugins[i].version_info.path)
       return CreateWebPluginInfo(g_internal_plugins[i].version_info, info);
   }
 
   // On windows, the way we get the mime types for the library is
   // to check the version information in the DLL itself.  This
   // will be a string of the format:  <type1>|<type2>|<type3>|...
   // For example:
   //     video/quicktime|audio/aiff|image/jpeg
   scoped_ptr<FileVersionInfo> version_info(
       FileVersionInfo::CreateFileVersionInfo(filename.value()));
   if (!version_info.get())
     return false;
 
-  std::wstring original_filename = version_info->original_filename();
-  std::wstring file_version = version_info->file_version();
-
   PluginVersionInfo pvi;
   version_info->GetValue(L"MIMEType", &pvi.mime_types);
   version_info->GetValue(L"FileExtents", &pvi.file_extents);
   version_info->GetValue(L"FileOpenName", &pvi.file_open_names);
   pvi.product_name = version_info->product_name();
   pvi.file_description = version_info->file_description();
-  pvi.file_version = file_version;
-  pvi.filename = original_filename;
-  pvi.path = filename.value();
+  pvi.file_version = version_info->file_version();
+  pvi.path = filename;
 
   return CreateWebPluginInfo(pvi, info);
 }
 
 }  // namespace NPAPI