Clean up PluginGroup and related code.

chrome/browser/ui/cocoa/content_setting_bubble_cocoa.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
@@ skipping 224 matching lines @@
   if (plugins.empty()) {
     int delta = NSMinY([titleLabel_ frame]) -
                 NSMinY([blockedResourcesField_ frame]);
     [blockedResourcesField_ removeFromSuperview];
     NSRect frame = [[self window] frame];
     frame.size.height -= delta;
     [[self window] setFrame:frame display:NO];
   } else {
     for (std::set<std::string>::iterator it = plugins.begin();
          it != plugins.end(); ++it) {
-      NSString* name;
-      NPAPI::PluginList::PluginMap groups;
-      NPAPI::PluginList::Singleton()->GetPluginGroups(false, &groups);
-      if (groups.find(*it) != groups.end())
-        name = base::SysUTF16ToNSString(groups[*it]->GetGroupName());
-      else
+      NSString* name = SysUTF16ToNSString(
+          NPAPI::PluginList::Singleton()->GetPluginGroupName(*it));
+      if ([name length] == 0)
         name = base::SysUTF8ToNSString(*it);
       [pluginArray addObject:name];
     }
     [blockedResourcesField_
         setStringValue:[pluginArray componentsJoinedByString:@"\n"]];
     [GTMUILocalizerAndLayoutTweaker
         sizeToFitFixedWidthTextField:blockedResourcesField_];
   }
 }
 
@@ skipping 216 matching lines @@
   DCHECK(i != popupLinks_.end());
   contentSettingBubbleModel_->OnPopupClicked(i->second);
 }
 
 - (void)clearGeolocationForCurrentHost:(id)sender {
   contentSettingBubbleModel_->OnClearLinkClicked();
   [self close];
 }
 
 @end  // ContentSettingBubbleController