Matching IBM Java plugin using pattern matching.

chrome/browser/plugins/plugin_metadata.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 "chrome/browser/plugins/plugin_metadata.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
+#include "base/string_util.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/plugin_utils.h"
 #include "webkit/plugins/webplugininfo.h"
 
 // static
 const char PluginMetadata::kAdobeReaderGroupName[] = "Adobe Reader";
 const char PluginMetadata::kJavaGroupName[] = "Java(TM)";
 const char PluginMetadata::kQuickTimeGroupName[] = "QuickTime Player";
 const char PluginMetadata::kShockwaveGroupName[] = "Adobe Shockwave Player";
 const char PluginMetadata::kRealPlayerGroupName[] = "RealPlayer";
 const char PluginMetadata::kSilverlightGroupName[] = "Silverlight";
 const char PluginMetadata::kWindowsMediaPlayerGroupName[] =
     "Windows Media Player";
 
 PluginMetadata::PluginMetadata(const std::string& identifier,
                                const string16& name,
                                bool url_for_display,
                                const GURL& plugin_url,
                                const GURL& help_url,
                                const string16& group_name_matcher,
-                               const std::string& language)
+                               const std::string& language,
+                               bool use_pattern_matching)
     : identifier_(identifier),
       name_(name),
       group_name_matcher_(group_name_matcher),
       url_for_display_(url_for_display),
       plugin_url_(plugin_url),
       help_url_(help_url),
-      language_(language) {
+      language_(language),
+      use_pattern_matching_(use_pattern_matching) {
 }
 
 PluginMetadata::~PluginMetadata() {
 }
 
 void PluginMetadata::AddVersion(const Version& version,
                                 SecurityStatus status) {
   DCHECK(versions_.find(version) == versions_.end());
   versions_[version] = status;
 }
@@ skipping 14 matching lines @@
 bool PluginMetadata::MatchesPlugin(const webkit::WebPluginInfo& plugin) {
   using webkit::npapi::PluginList;
 
   for (size_t i = 0; i < matching_mime_types_.size(); ++i) {
     // To have a match, every one of the |matching_mime_types_|
     // must be handled by the plug-in.
     if (!PluginList::SupportsType(plugin, matching_mime_types_[i], false))
       return false;
   }
 
-  return plugin.name.find(group_name_matcher_) != string16::npos;
+  return use_pattern_matching_ ?

[Bernhard Bauer, 2012/11/22 18:40:48]

Hm, we might be able to keep this a bit simpler by always using MatchPattern. We
just need to transform the patterns where we want to do substring matching by
pre- and appending a "*".

+      MatchPattern(plugin.name, group_name_matcher_) :
+      plugin.name.find(group_name_matcher_) != string16::npos;
 }
 
 // static
 bool PluginMetadata::ParseSecurityStatus(
     const std::string& status_str,
     PluginMetadata::SecurityStatus* status) {
   if (status_str == "up_to_date")
     *status = SECURITY_STATUS_UP_TO_DATE;
   else if (status_str == "out_of_date")
     *status = SECURITY_STATUS_OUT_OF_DATE;
@@ skipping 38 matching lines @@
   return lhs.CompareTo(rhs) > 0;
 }
 
 scoped_ptr<PluginMetadata> PluginMetadata::Clone() const {
   PluginMetadata* copy = new PluginMetadata(identifier_,
                                             name_,
                                             url_for_display_,
                                             plugin_url_,
                                             help_url_,
                                             group_name_matcher_,
-                                            language_);
+                                            language_,
+                                            use_pattern_matching_);
   copy->versions_ = versions_;
   return make_scoped_ptr(copy);
 }