| 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 88e1d17b9dc525a17e617b3df86270db3d7f80e9..bf790fa64e2654a1907e7ef8572bbd6ad19f2da3 100644
|
| --- a/chrome/browser/renderer_host/plugin_info_message_filter.cc
|
| +++ b/chrome/browser/renderer_host/plugin_info_message_filter.cc
|
| @@ -147,15 +147,14 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
|
| const WebPluginInfo& plugin,
|
| PluginFinder* plugin_finder,
|
| ChromeViewHostMsg_GetPluginInfo_Status* status) const {
|
| - scoped_ptr<webkit::npapi::PluginGroup> group(
|
| - webkit::npapi::PluginList::Singleton()->GetPluginGroup(plugin));
|
| + PluginInstaller* installer = plugin_finder->GetPluginInstaller(plugin);
|
|
|
| ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
|
| bool uses_default_content_setting = true;
|
| // Check plug-in content settings. The primary URL is the top origin URL and
|
| // the secondary URL is the plug-in URL.
|
| GetPluginContentSetting(plugin, params.top_origin_url, params.url,
|
| - group->identifier(), &plugin_setting,
|
| + installer->identifier(), &plugin_setting,
|
| &uses_default_content_setting);
|
| DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
|
|
|
| @@ -168,8 +167,6 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(
|
| PluginInstaller::SecurityStatus plugin_status =
|
| PluginInstaller::SECURITY_STATUS_UP_TO_DATE;
|
| #endif
|
| - PluginInstaller* installer =
|
| - plugin_finder->FindPluginWithIdentifier(group->identifier());
|
| if (installer)
|
| plugin_status = installer->GetSecurityStatus(plugin);
|
| // Check if the plug-in is outdated.
|
|
|