Clean up PluginGroup and related code.

chrome/browser/ui/views/content_setting_bubble_contents.cc

Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index ff4561cbe822d9d0d8efc54216c52b931936a363..4263077b99a3b89aed72d7ab31321a1311032971 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -230,10 +230,9 @@ void ContentSettingBubbleContents::InitControlLayout() {
     for (std::set<std::string>::const_iterator it = plugins.begin();
         it != plugins.end(); ++it) {
       std::wstring name;
-      NPAPI::PluginList::PluginMap groups;
-      NPAPI::PluginList::Singleton()->GetPluginGroups(false, &groups);
-      if (groups.find(*it) != groups.end())
-        name = UTF16ToWide(groups[*it]->GetGroupName());
+      NPAPI::PluginList::PluginGroup group;
+      if (NPAPI::PluginList::Singleton()->GetPluginGroup(false, *it, &groups))

[Bernhard Bauer, 2010/12/03 16:13:28]

There's something wrong here. I guess that's why it doesn't compile ;-)

[Jakob Kummerow, 2010/12/06 18:21:12]

Done.
This should of course match the code in content_setting_bubble_gtk.cc.

+        name = UTF16ToWide(group.GetGroupName());
       else
         name = UTF8ToWide(*it);
       layout->StartRow(0, single_column_set_id);