Revert 171389

content/common/pepper_plugin_registry.cc

 // Copyright (c) 2012 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 "content/common/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/native_library.h"
 #include "base/string_split.h"
@@ skipping 52 matching lines @@
       plugin.description = name_parts[2];
     if (name_parts.size() > 3)
       plugin.version = name_parts[3];
     for (size_t j = 1; j < parts.size(); ++j) {
       webkit::WebPluginMimeType mime_type(parts[j],
                                           std::string(),
                                           plugin.description);
       plugin.mime_types.push_back(mime_type);
     }
 
+    // If the plugin name is empty, use the filename.
+    if (plugin.name.empty())
+      plugin.name = UTF16ToUTF8(plugin.path.BaseName().LossyDisplayName());
+
     // Command-line plugins get full permissions.
     plugin.permissions = ppapi::PERMISSION_ALL_BITS;
 
     plugins->push_back(plugin);
   }
 }
 
 }  // namespace
 
 webkit::WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const {
@@ skipping 153 matching lines @@
       if (!module->InitAsLibrary(current.path)) {
         DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
         continue;
       }
     }
     preloaded_modules_[current.path] = module;
   }
 }
 
 }  // namespace content