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 2671 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);
+  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;
   }
 
   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;
     if (PepperPluginRegistry::GetInstance()->RunOutOfProcessForPlugin(
             info.path)) {
       pepper_module =
           pepper_delegate_.CreateOutOfProcessPepperPlugin(info.path);
     } else {
       pepper_module =
           PepperPluginRegistry::GetInstance()->GetModule(info.path);
     }
     if (pepper_module) {
       return CreatePepperPlugin(frame,
                                 params,
                                 info.path,
                                 pepper_module.get());
     }
     return CreateNPAPIPlugin(frame, params, info.path, actual_mime_type);
   }
   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;
   if (plugin_setting == CONTENT_SETTING_ASK) {
     resource_id = IDR_BLOCKED_PLUGIN_HTML;
     message_id = IDS_PLUGIN_LOAD;
   } else {
     resource_id = IDR_OUTDATED_PLUGIN_HTML;
     message_id = IDS_PLUGIN_BLOCKED;
   }
   // |blocked_plugin| will delete itself when the WebViewPlugin
   // is destroyed.
   BlockedPlugin* blocked_plugin =
       new BlockedPlugin(this,
                         frame,
-                        *group,
+                        group,
                         params,
                         webkit_preferences_,
                         resource_id,
                         l10n_util::GetStringUTF16(message_id));
   return blocked_plugin->plugin();
 }
 
 WebWorker* RenderView::createWorker(WebFrame* frame, WebWorkerClient* client) {
   WebApplicationCacheHostImpl* appcache_host =
       WebApplicationCacheHostImpl::FromFrame(frame);
@@ skipping 1637 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) {
+    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 1259 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }