Using MIME types in addition to plugin name to differentiate between plugins.

chrome/browser/plugins/plugin_finder.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_finder.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 13 matching lines @@
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugins/plugin_installer.h"
 #endif
 
 using base::DictionaryValue;
 using content::PluginService;
 
 namespace {
 
+const char kMimeTypesListKey[] = "mime_types";
+const char kMatchingMimeTypesListKey[] = "matching_mime_types";
+
 // Gets the base name of the file path as the identifier.
 static std::string GetIdentifier(const webkit::WebPluginInfo& plugin) {
 #if defined(OS_POSIX)
   return plugin.path.BaseName().value();
 #elif defined(OS_WIN)
   return base::SysWideToUTF8(plugin.path.BaseName().value());
 #endif
 }
 
 // Gets the plug-in group name as the plug-in name if it is not empty or
 // the filename without extension if the name is empty.
 static string16 GetGroupName(const webkit::WebPluginInfo& plugin) {
   if (!plugin.name.empty())
     return plugin.name;
 
   FilePath::StringType path = plugin.path.BaseName().RemoveExtension().value();
 #if defined(OS_POSIX)
   return UTF8ToUTF16(path);
 #elif defined(OS_WIN)
   return WideToUTF16(path);
 #endif
 }
 
+void LoadMimeTypes(const std::string& mime_type_list_key,
+                   const DictionaryValue* plugin_dict,
+                   PluginMetadata* plugin) {
+  const ListValue* mime_types = NULL;
+  if (!plugin_dict->GetList(mime_type_list_key, &mime_types))
+    return;
+
+  bool success = false;
+  for (ListValue::const_iterator mime_type_it = mime_types->begin();
+       mime_type_it != mime_types->end(); ++mime_type_it) {
+    std::string mime_type_str;
+    success = (*mime_type_it)->GetAsString(&mime_type_str);
+    DCHECK(success);
+    if (mime_type_list_key == kMatchingMimeTypesListKey) {

[Bernhard Bauer, 2012/10/02 14:40:13]

This might be a bit simpler if you create a method that parses a ListValue of
StringValues and writes the strings to a std::vector<std::string>. Then you
fetch the list from the dictionary below and add the MIME types directly.

Alternatively, you could pass in a boolean that tells whether to look at the
list of MIME types for installing or for matching.

[ibraaaa, 2012/10/02 16:14:53]

Well, if I send a boolean value (actually that is what I was doing before this)
it will be doing the same thing as |mime_type_list_key| since I need this key
anyway to fetch the correct list from the dictionary, WDYT?

On 2012/10/02 14:40:13, Bernhard Bauer wrote:

[Bernhard Bauer, 2012/10/04 11:37:19]

Right, it just seems a bit more awkward to pass in a string that can only have
two values instead of a boolean.

[ibraaaa, 2012/10/04 12:24:12]

Done.

+      plugin->AddMatchingMimeType(mime_type_str);
+    } else if (mime_type_list_key == kMimeTypesListKey) {
+      plugin->AddMimeType(mime_type_str);
+    } else {
+      NOTREACHED();
+      return;
+    }
+  }
+}
+
 PluginMetadata* CreatePluginMetadata(
     const std::string& identifier,
     const DictionaryValue* plugin_dict) {
   std::string url;
   bool success = plugin_dict->GetString("url", &url);
   std::string help_url;
   plugin_dict->GetString("help_url", &help_url);
   string16 name;
   success = plugin_dict->GetString("name", &name);
   DCHECK(success);
   bool display_url = false;
   plugin_dict->GetBoolean("displayurl", &display_url);
   string16 group_name_matcher;
   success = plugin_dict->GetString("group_name_matcher", &group_name_matcher);
   DCHECK(success);
+  std::string language_str;
+  plugin_dict->GetString("lang", &language_str);
 
   PluginMetadata* plugin = new PluginMetadata(identifier,
                                               name,
                                               display_url,
                                               GURL(url),
                                               GURL(help_url),
-                                              group_name_matcher);
+                                              group_name_matcher,
+                                              language_str);
   const ListValue* versions = NULL;
   if (plugin_dict->GetList("versions", &versions)) {
     for (ListValue::const_iterator it = versions->begin();
          it != versions->end(); ++it) {
       DictionaryValue* version_dict = NULL;
       if (!(*it)->GetAsDictionary(&version_dict)) {
         NOTREACHED();
         continue;
       }
       std::string version;
       success = version_dict->GetString("version", &version);
       DCHECK(success);
       std::string status_str;
       success = version_dict->GetString("status", &status_str);
       DCHECK(success);
       PluginMetadata::SecurityStatus status =
           PluginMetadata::SECURITY_STATUS_UP_TO_DATE;
       success = PluginMetadata::ParseSecurityStatus(status_str, &status);
       DCHECK(success);
       plugin->AddVersion(Version(version), status);
     }
   }
 
+  LoadMimeTypes(kMimeTypesListKey, plugin_dict, plugin);
+  LoadMimeTypes(kMatchingMimeTypesListKey, plugin_dict, plugin);
   return plugin;
 }
 
 }  // namespace
 
 // static
 PluginFinder* PluginFinder::GetInstance() {
   // PluginFinder::GetInstance() is the only method that's allowed to call
   // Singleton<PluginFinder>::get().
   return Singleton<PluginFinder>::get();
@@ skipping 48 matching lines @@
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 bool PluginFinder::FindPlugin(
     const std::string& mime_type,
     const std::string& language,
     PluginInstaller** installer,
     scoped_ptr<PluginMetadata>* plugin_metadata) {
   base::AutoLock lock(mutex_);
   if (g_browser_process->local_state()->GetBoolean(prefs::kDisablePluginFinder))
     return false;
-  for (DictionaryValue::Iterator plugin_it(*plugin_list_);
-       plugin_it.HasNext(); plugin_it.Advance()) {
-    const DictionaryValue* plugin = NULL;
-    if (!plugin_it.value().GetAsDictionary(&plugin)) {
-      NOTREACHED();
-      continue;
-    }
-    std::string language_str;
-    bool success = plugin->GetString("lang", &language_str);
-    if (language_str != language)
-      continue;
-    const ListValue* mime_types = NULL;
-    plugin->GetList("mime_types", &mime_types);
-    DCHECK(success);
-    for (ListValue::const_iterator mime_type_it = mime_types->begin();
-         mime_type_it != mime_types->end(); ++mime_type_it) {
-      std::string mime_type_str;
-      success = (*mime_type_it)->GetAsString(&mime_type_str);
-      DCHECK(success);
-      if (mime_type_str == mime_type) {
-        std::string identifier = plugin_it.key();
-        std::map<std::string, PluginMetadata*>::const_iterator metadata_it =
-            identifier_plugin_.find(identifier);
-        DCHECK(metadata_it != identifier_plugin_.end());
-        *plugin_metadata = metadata_it->second->Clone();
 
-        std::map<std::string, PluginInstaller*>::const_iterator installer_it =
-            installers_.find(identifier);
-        DCHECK(installer_it != installers_.end());
-        *installer = installer_it->second;
-        return true;
-      }
+  std::map<std::string, PluginMetadata*>::const_iterator metadata_it =

[Bernhard Bauer, 2012/10/02 14:40:13]

You use this map type in a bunch of places. You could typedef it to make it a
bit shorter. 

[ibraaaa, 2012/10/02 16:14:53]

Done.

+      identifier_plugin_.begin();
+  for (; metadata_it != identifier_plugin_.end(); ++metadata_it) {
+    if (language == metadata_it->second->language() &&
+        metadata_it->second->HasMimeType(mime_type)) {
+      *plugin_metadata = metadata_it->second->Clone();
+
+      std::map<std::string, PluginInstaller*>::const_iterator installer_it =
+          installers_.find(metadata_it->second->identifier());
+      DCHECK(installer_it != installers_.end());
+      *installer = installer_it->second;
+      return true;
     }
   }
   return false;
 }
 
 bool PluginFinder::FindPluginWithIdentifier(
     const std::string& identifier,
     PluginInstaller** installer,
     scoped_ptr<PluginMetadata>* plugin_metadata) {
   base::AutoLock lock(mutex_);
@@ skipping 20 matching lines @@
   string16 name;
   if (it != identifier_plugin_.end())
     name = it->second->name();
 
   return name.empty() ? UTF8ToUTF16(identifier) : name;
 }
 
 scoped_ptr<PluginMetadata> PluginFinder::GetPluginMetadata(
     const webkit::WebPluginInfo& plugin) {
   base::AutoLock lock(mutex_);
-  if (name_plugin_.find(plugin.name) != name_plugin_.end())
-    return name_plugin_[plugin.name]->Clone();
-
-  // Use the group name matcher to find the plug-in metadata we want.
   for (std::map<std::string, PluginMetadata*>::const_iterator it =
       identifier_plugin_.begin(); it != identifier_plugin_.end(); ++it) {
-    if (!it->second->MatchesPlugin(plugin))
+    string16 matching_name;
+    if (!it->second->MatchesPlugin(plugin, &matching_name))
       continue;
 
-    name_plugin_[plugin.name] = it->second;
+    name_plugin_[matching_name] = it->second;

[Bernhard Bauer, 2012/10/02 14:40:13]

You're never reading from |name_plugin_| anymore.

It seems that now we can't find a plug-in based on the name alone, so the cache
might not make sense anymore.

[ibraaaa, 2012/10/02 16:14:53]

Done.

     return it->second->Clone();
   }
 
   // The plug-in metadata was not found, create a dummy one holding
   // the name, identifier and group name only.
   std::string identifier = GetIdentifier(plugin);
   PluginMetadata* metadata = new PluginMetadata(identifier,
                                                 GetGroupName(plugin),
                                                 false, GURL(), GURL(),
-                                                GetGroupName(plugin));
-
+                                                GetGroupName(plugin),
+                                                "");
   name_plugin_[plugin.name] = metadata;
   identifier_plugin_[identifier] = metadata;
   return metadata->Clone();
 }
 
 void PluginFinder::ReinitializePlugins(
     const base::DictionaryValue& json_metadata) {
   base::AutoLock lock(mutex_);
   STLDeleteValues(&identifier_plugin_);
   identifier_plugin_.clear();
@@ skipping 12 matching lines @@
       DCHECK(!identifier_plugin_[identifier]);
       identifier_plugin_[identifier] = CreatePluginMetadata(identifier, plugin);
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
       if (installers_.find(identifier) == installers_.end())
         installers_[identifier] = new PluginInstaller();
 #endif
     }
   }
 }