Clean up PluginGroup and related code.

chrome/renderer/render_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2672 matching lines @@
                                      params.mimeType.utf8(),
                                      &found,
                                      &info,
                                      &plugin_setting,
                                      &actual_mime_type));
 
   if (!found)
     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) &&
         group->IsVulnerable()) {
       Send(new ViewHostMsg_DisabledOutdatedPlugin(routing_id_,
                                                   group->GetGroupName(),
                                                   GURL(group->GetUpdateURL())));
-      return CreateOutdatedPluginPlaceholder(frame, params, group.get());
+      return CreateOutdatedPluginPlaceholder(frame, params, *group);
     }
     return NULL;
   }
 
   ContentSetting host_setting =
       current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS];
   if (info.path.value() == kDefaultPluginLibraryName ||
       plugin_setting == CONTENT_SETTING_ALLOW ||
       host_setting == CONTENT_SETTING_ALLOW) {
     scoped_refptr<pepper::PluginModule> pepper_module;
@@ skipping 1682 matching lines @@
                                          const WebPluginParams& params,
                                          const FilePath& path,
                                          const std::string& mime_type) {
   return new webkit_glue::WebPluginImpl(
       frame, params, path, mime_type, AsWeakPtr());
 }
 
 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));
 
   DCHECK(!template_html.empty()) << "unable to load template. ID: "
                                  << resource_id;
 
   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(
       template_html, &values, "t");
 
   return WebViewPlugin::Create(NULL,
                                webkit_preferences_,
                                htmlData,
                                GURL("chrome://outdatedplugin/"));
 }
@@ skipping 1260 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }