Re-land: add support for blocking out-of-date plug-ins on Linux....

webkit/plugins/npapi/plugin_group.cc

 // Copyright (c) 2010 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/plugins/npapi/plugin_group.h"
 
 #include "base/linked_ptr.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 163 matching lines @@
   // Look for the name matcher anywhere in the plugin name.
   if (plugin.name.find(name_matcher_) == string16::npos) {
     return false;
   }
 
   if (version_ranges_.empty()) {
     return true;
   }
 
   // There's at least one version range, the plugin's version must be in it.
-  scoped_ptr<Version> plugin_version(
-      Version::GetVersionFromString(UTF16ToASCII(plugin.version)));
+  scoped_ptr<Version> plugin_version(CreateVersionFromString(plugin.version));
   if (plugin_version.get() == NULL) {
     // No version could be extracted, assume we don't match the range.
     return false;
   }
 
   // Match if the plugin is contained in any of the defined VersionRanges.
   for (size_t i = 0; i < version_ranges_.size(); ++i) {
     if (IsVersionInRange(*plugin_version, version_ranges_[i])) {
       return true;
     }
   }
   // None of the VersionRanges matched.
   return false;
 }
 
 /* static */
 Version* PluginGroup::CreateVersionFromString(const string16& version_string) {
   // Remove spaces and ')' from the version string,
   // Replace any instances of 'r', ',' or '(' with a dot.
   std::wstring version = UTF16ToWide(version_string);
   RemoveChars(version, L") ", &version);
   std::replace(version.begin(), version.end(), 'r', '.');
   std::replace(version.begin(), version.end(), ',', '.');
   std::replace(version.begin(), version.end(), '(', '.');
+  std::replace(version.begin(), version.end(), '_', '.');
 
   return Version::GetVersionFromString(WideToASCII(version));
 }
 
 void PluginGroup::UpdateActivePlugin(const WebPluginInfo& plugin) {
   // A group is enabled if any of the files are enabled.
   if (plugin.enabled) {
     if (!enabled_) {
       // If this is the first enabled plugin, use its description.
       enabled_ = true;
@@ skipping 184 matching lines @@
     } else {
       it->enabled = false;
       PluginList::Singleton()->DisablePlugin(it->path);
     }
   }
   enabled_ = enabled_plugin_exists;
 }
 
 }  // namespace npapi
 }  // namespace webkit