Clean up PluginGroup and related code.

chrome/browser/gtk/content_setting_bubble_gtk.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/browser/gtk/content_setting_bubble_gtk.h"
 
+#include <set>
+#include <string>
+#include <vector>
+
 #include "app/l10n_util.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/blocked_content_container.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_setting_bubble_model.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
@@ skipping 80 matching lines @@
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     gtk_box_pack_start(GTK_BOX(bubble_content), label, FALSE, FALSE, 0);
   }
 
   const std::set<std::string>& plugins = content.resource_identifiers;
   if (!plugins.empty()) {
     GtkWidget* list_content = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
     for (std::set<std::string>::const_iterator it = plugins.begin();
         it != plugins.end(); ++it) {
-      std::string name;
-      NPAPI::PluginList::PluginMap groups;
-      NPAPI::PluginList::Singleton()->GetPluginGroups(false, &groups);
-      if (groups.find(*it) != groups.end())
-        name = UTF16ToUTF8(groups[*it]->GetGroupName());
-      else
+      std::string name = UTF16ToUTF8(
+          NPAPI::PluginList::Singleton()->GetPluginGroupName(*it));
+      if (name.empty())
         name = *it;
 
       GtkWidget* label = gtk_label_new(BuildElidedText(name).c_str());
       GtkWidget* label_box = gtk_hbox_new(FALSE, 0);
       gtk_box_pack_start(GTK_BOX(label_box), label, FALSE, FALSE, 0);
 
       gtk_box_pack_start(GTK_BOX(list_content),
                          label_box,
                          FALSE, FALSE, 0);
     }
@@ skipping 219 matching lines @@
 
 void ContentSettingBubbleGtk::OnInfoLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnInfoLinkClicked();
   Close();
 }
 
 void ContentSettingBubbleGtk::OnLoadPluginsLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnLoadPluginsLinkClicked();
   Close();
 }