Policy: Re-enabled plugin still disabled

chrome/common/pepper_plugin_registry.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 "chrome/common/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
@@ skipping 103 matching lines @@
 #else
     plugin.path = FilePath(name_parts[0]);
 #endif
     if (name_parts.size() > 1)
       plugin.name = name_parts[1];
     if (name_parts.size() > 2)
       plugin.type_descriptions = name_parts[2];
     for (size_t j = 1; j < parts.size(); ++j)
       plugin.mime_types.push_back(parts[j]);
 
+    // Empty description is not allowed so use the plugin base name if none is

[jam, 2011/01/19 20:22:09]

this is not the case anymore, right?

[pastarmovj, 2011/01/19 23:39:17]

Done.

+    // provided.
+    if (plugin.type_descriptions.length() == 0) {
+#if defined(OS_WIN)
+      plugin.type_descriptions =
+          UTF16ToUTF8(plugin.path.BaseName().RemoveExtension().value());
+#else
+      plugin.type_descriptions =
+          plugin.path.BaseName().RemoveExtension().value();
+#endif
+    }
+
     plugins->push_back(plugin);
   }
 }
 
 // static
 void PepperPluginRegistry::GetExtraPlugins(
     std::vector<PepperPluginInfo>* plugins) {
   // Once we're sandboxed, we can't know if the PDF plugin is
   // available or not; but (on Linux) this function is always called
   // once before we're sandboxed.  So the first time through test if
@@ skipping 166 matching lines @@
     // destructor will call the corresponding Remove in the "continue" case.
     AddLiveModule(path, module);
     if (!module->InitAsLibrary(path)) {
       DLOG(ERROR) << "Failed to load pepper module: " << path.value();
       continue;
     }
     module->set_name(plugins[i].name);
     preloaded_modules_[path] = module;
   }
 }