Clean up PluginGroup and related code.

chrome/renderer/render_view.cc

Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index bc99517d4b0f9e8d7207afc3c71695fef2217d68..cbcc880fc3814a91dedf62815bfc9ff09bcccb40 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2689,16 +2689,15 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
     return NULL;
   DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
 
-  scoped_ptr<PluginGroup> group(PluginGroup::CopyOrCreatePluginGroup(info));
-  group->AddPlugin(info, 0);
+  PluginGroup group = NPAPI::PluginList::Singleton()->GetPluginGroup(info);
 
   if (!info.enabled) {
     if (cmd->HasSwitch(switches::kDisableOutdatedPlugins) &&
-        group->IsVulnerable()) {
+        group.IsVulnerable()) {
       Send(new ViewHostMsg_DisabledOutdatedPlugin(routing_id_,
-                                                  group->GetGroupName(),
-                                                  GURL(group->GetUpdateURL())));
-      return CreateOutdatedPluginPlaceholder(frame, params, group.get());
+                                                  group.GetGroupName(),
+                                                  GURL(group.GetUpdateURL())));
+      return CreateOutdatedPluginPlaceholder(frame, params, group);
     }
     return NULL;
   }
@@ -2727,7 +2726,7 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
   }
   std::string resource;
   if (cmd->HasSwitch(switches::kEnableResourceContentSettings))
-    resource = group->identifier();
+    resource = group.identifier();
   DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource);
   int resource_id;
   int message_id;
@@ -2743,7 +2742,7 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
   BlockedPlugin* blocked_plugin =
       new BlockedPlugin(this,
                         frame,
-                        *group,
+                        group,
                         params,
                         webkit_preferences_,
                         resource_id,
@@ -4401,7 +4400,7 @@ WebPlugin* RenderView::CreateNPAPIPlugin(WebFrame* frame,
 WebPlugin* RenderView::CreateOutdatedPluginPlaceholder(
     WebFrame* frame,
     const WebPluginParams& params,
-    PluginGroup* group) {
+    PluginGroup& group) {
   int resource_id = IDR_OUTDATED_PLUGIN_HTML;
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
@@ -4411,8 +4410,8 @@ WebPlugin* RenderView::CreateOutdatedPluginPlaceholder(
 
   DictionaryValue values;
   values.SetString("message",
-      l10n_util::GetStringFUTF8(IDS_PLUGIN_OUTDATED, group->GetGroupName()));
-  values.Set("pluginGroup", group->GetDataForUI());
+      l10n_util::GetStringFUTF8(IDS_PLUGIN_OUTDATED, group.GetGroupName()));
+  values.Set("pluginGroup", group.GetDataForUI());
 
   // "t" is the id of the templates root node.
   std::string htmlData = jstemplate_builder::GetTemplatesHtml(