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 f5558ef2298ab4c953c753330097310bf6762047..6ed2fa3962cd1bbd19915cc14127feaa621cee60 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2690,8 +2690,9 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
     return NULL;
   DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
 
-  scoped_ptr<PluginGroup> group(PluginGroup::CopyOrCreatePluginGroup(info));
-  group->AddPlugin(info, 0);
+  const PluginGroup* group =
+      NPAPI::PluginList::Singleton()->GetPluginGroup(info);
+  DCHECK(group != NULL);
 
   if (!info.enabled) {
     if (cmd->HasSwitch(switches::kDisableOutdatedPlugins) &&
@@ -2699,7 +2700,7 @@ WebPlugin* RenderView::createPlugin(WebFrame* frame,
       Send(new ViewHostMsg_DisabledOutdatedPlugin(routing_id_,
                                                   group->GetGroupName(),
                                                   GURL(group->GetUpdateURL())));
-      return CreateOutdatedPluginPlaceholder(frame, params, group.get());
+      return CreateOutdatedPluginPlaceholder(frame, params, *group);
     }
     return NULL;
   }
@@ -4402,7 +4403,7 @@ WebPlugin* RenderView::CreateNPAPIPlugin(WebFrame* frame,
 WebPlugin* RenderView::CreateOutdatedPluginPlaceholder(
     WebFrame* frame,
     const WebPluginParams& params,
-    PluginGroup* group) {
+    const PluginGroup& group) {
   int resource_id = IDR_OUTDATED_PLUGIN_HTML;
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
@@ -4412,8 +4413,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(