Separate plugin_metadata from plugin_installer, thread-safe plugin_finder

chrome/browser/extensions/api/content_settings/content_settings_api.cc

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
index c176a68e9b206b304a6d65422f0b0a0bee41848d..c1bbc34c2928982aa2923ecc04252ec578f3653a 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/extensions/extension_preference_helpers.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/plugin_finder.h"
-#include "chrome/browser/plugin_installer.h"
+#include "chrome/browser/plugin_metadata.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
@@ -259,32 +259,30 @@ bool GetResourceIdentifiersFunction::RunImpl() {
   }
 
   if (!g_testing_plugins_) {
-    PluginFinder::GetPluginsAndPluginFinder(
+    PluginService::GetInstance()->GetPlugins(
         base::Bind(&GetResourceIdentifiersFunction::OnGotPlugins, this));
   } else {
-    PluginFinder::Get(
-        base::Bind(&GetResourceIdentifiersFunction::OnGotPlugins, this,
-                   *g_testing_plugins_));
+    OnGotPlugins(*g_testing_plugins_);
   }
   return true;
 }
 
 void GetResourceIdentifiersFunction::OnGotPlugins(
-    const std::vector<webkit::WebPluginInfo>& plugins,
-    PluginFinder* finder) {
+    const std::vector<webkit::WebPluginInfo>& plugins) {
+  PluginFinder* finder = PluginFinder::GetInstance();
   std::set<std::string> group_identifiers;
   ListValue* list = new ListValue();
   for (std::vector<webkit::WebPluginInfo>::const_iterator it = plugins.begin();
        it != plugins.end(); ++it) {
-    PluginInstaller* installer = finder->GetPluginInstaller(*it);
-    const std::string& group_identifier = installer->identifier();
+    PluginMetadata* plugin_metadata = finder->GetPluginMetadata(*it);
+    const std::string& group_identifier = plugin_metadata->identifier();
     if (group_identifiers.find(group_identifier) != group_identifiers.end())
       continue;
 
     group_identifiers.insert(group_identifier);
     DictionaryValue* dict = new DictionaryValue();
     dict->SetString(keys::kIdKey, group_identifier);
-    dict->SetString(keys::kDescriptionKey, installer->name());
+    dict->SetString(keys::kDescriptionKey, plugin_metadata->name());
     list->Append(dict);
   }
   SetResult(list);