Separate plugin_metadata from plugin_installer, thread-safe plugin_finder

chrome/browser/renderer_host/plugin_info_message_filter.cc

Index: chrome/browser/renderer_host/plugin_info_message_filter.cc
diff --git a/chrome/browser/renderer_host/plugin_info_message_filter.cc b/chrome/browser/renderer_host/plugin_info_message_filter.cc
index 2f5235e12f899bc02d6f10dd04e42897f345dee4..13e17e9860f406a12e4a2d2a7eaac6e56767592f 100644
--- a/chrome/browser/renderer_host/plugin_info_message_filter.cc
+++ b/chrome/browser/renderer_host/plugin_info_message_filter.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.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_content_client.h"
@@ -118,18 +118,9 @@ void PluginInfoMessageFilter::PluginsLoaded(
     return;
   }
 
-  PluginFinder::Get(base::Bind(&PluginInfoMessageFilter::GotPluginFinder, this,
-                               params, reply_msg, output));
-}
-
-void PluginInfoMessageFilter::GotPluginFinder(
-    const GetPluginInfo_Params& params,
-    IPC::Message* reply_msg,
-    ChromeViewHostMsg_GetPluginInfo_Output output,
-    PluginFinder* plugin_finder) {
-  context_.DecidePluginStatus(params, output.plugin, plugin_finder,
-                              &output.status, &output.group_identifier,
-                              &output.group_name);
+  context_.DecidePluginStatus(params, output.plugin,
+                              PluginFinder::GetInstance(), &output.status,
+                              &output.group_identifier, &output.group_name);
   ChromeViewHostMsg_GetPluginInfo::WriteReplyParams(reply_msg, output);
   Send(reply_msg);
 }
@@ -141,9 +132,9 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
     ChromeViewHostMsg_GetPluginInfo_Status* status,
     std::string* group_identifier,
     string16* group_name) const {
-  PluginInstaller* installer = plugin_finder->GetPluginInstaller(plugin);
-  *group_name = installer->name();
-  *group_identifier = installer->identifier();
+  PluginMetadata* plugin_metadata = plugin_finder->GetPluginMetadata(plugin);
+  *group_name = plugin_metadata->name();
+  *group_identifier = plugin_metadata->identifier();
 
   ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
   bool uses_default_content_setting = true;
@@ -157,16 +148,16 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 #if defined(OS_LINUX)
   // On Linux, unknown plugins require authorization.
-  PluginInstaller::SecurityStatus plugin_status =
-      PluginInstaller::SECURITY_STATUS_REQUIRES_AUTHORIZATION;
+  PluginMetadata::SecurityStatus plugin_status =
+      PluginMetadata::SECURITY_STATUS_REQUIRES_AUTHORIZATION;
 #else
-  PluginInstaller::SecurityStatus plugin_status =
-      PluginInstaller::SECURITY_STATUS_UP_TO_DATE;
+  PluginMetadata::SecurityStatus plugin_status =
+      PluginMetadata::SECURITY_STATUS_UP_TO_DATE;
 #endif
-  if (installer)
-    plugin_status = installer->GetSecurityStatus(plugin);
+  if (plugin_metadata)
+    plugin_status = plugin_metadata->GetSecurityStatus(plugin);
   // Check if the plug-in is outdated.
-  if (plugin_status == PluginInstaller::SECURITY_STATUS_OUT_OF_DATE &&
+  if (plugin_status == PluginMetadata::SECURITY_STATUS_OUT_OF_DATE &&
       !allow_outdated_plugins_.GetValue()) {
     if (allow_outdated_plugins_.IsManaged()) {
       status->value =
@@ -179,7 +170,7 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
 
   // Check if the plug-in requires authorization.
   if ((plugin_status ==
-           PluginInstaller::SECURITY_STATUS_REQUIRES_AUTHORIZATION ||
+           PluginMetadata::SECURITY_STATUS_REQUIRES_AUTHORIZATION ||
        PluginService::GetInstance()->IsPluginUnstable(plugin.path)) &&
       plugin.type != WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS &&
       plugin.type != WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS &&