Clean up PluginGroup and related code.

chrome/browser/ui/views/content_setting_bubble_contents.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/views/content_setting_bubble_contents.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
@@ skipping 211 matching lines @@
         bubble_content.title));
     layout->StartRow(0, single_column_set_id);
     layout->AddView(title_label);
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
 
   const std::set<std::string>& plugins = bubble_content.resource_identifiers;
   if (!plugins.empty()) {
     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());
-      else
+      std::wstring name = UTF16ToWide(
+          NPAPI::PluginList::Singleton()->GetPluginGroupName(*it));
+      if (name.empty())
         name = UTF8ToWide(*it);
       layout->StartRow(0, single_column_set_id);
       layout->AddView(new views::Label(name));
     }
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
 
   if (content_setting_bubble_model_->content_type() ==
       CONTENT_SETTINGS_TYPE_POPUPS) {
     const int popup_column_set_id = 2;
@@ skipping 126 matching lines @@
 
   layout->StartRow(0, double_column_set_id);
   manage_link_ = new views::Link(UTF8ToWide(bubble_content.manage_link));
   manage_link_->SetController(this);
   layout->AddView(manage_link_);
 
   close_button_ =
       new views::NativeButton(this, l10n_util::GetString(IDS_DONE));
   layout->AddView(close_button_);
 }