Remove PluginFinder async interface

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

 // Copyright (c) 2012 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_settings/content_setting_bubble_cocoa.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/plugins/plugin_finder.h"
+#include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #include "content/public/browser/plugin_service.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 218 matching lines @@
   const std::set<std::string>& plugins =
       contentSettingBubbleModel_->bubble_content().resource_identifiers;
   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 {
+    PluginFinder* finder = PluginFinder::GetInstance();
     for (std::set<std::string>::iterator it = plugins.begin();
          it != plugins.end(); ++it) {
-      NSString* name = SysUTF16ToNSString(
-          PluginService::GetInstance()->GetPluginGroupName(*it));
-      if ([name length] == 0)
+      PluginMetadata* plugin = finder->FindPluginMetadataWithIdentifier(*it);
+      NSString* name = nil;

[Peter Kasting, 2012/09/21 20:10:56]

Nit: Or just

      NSString* name = plugin ? SysUTF16ToNSString(plugin->name() : nil;

[ibraaaa, 2012/09/24 11:42:29]

Done.

+      if (plugin)
+        name = SysUTF16ToNSString(plugin->name());
+      if (!name || [name length] == 0)
         name = base::SysUTF8ToNSString(*it);
       [pluginArray addObject:name];
     }
     [blockedResourcesField_
         setStringValue:[pluginArray componentsJoinedByString:@"\n"]];
     [GTMUILocalizerAndLayoutTweaker
         sizeToFitFixedWidthTextField:blockedResourcesField_];
   }
 }
 
@@ skipping 228 matching lines @@
 - (IBAction)manageBlocking:(id)sender {
   contentSettingBubbleModel_->OnManageLinkClicked();
 }
 
 - (IBAction)closeBubble:(id)sender {
   contentSettingBubbleModel_->OnDoneClicked();
   [self close];
 }
 
 @end  // ContentSettingBubbleController