Remove PluginFinder async interface

chrome/browser/ui/gtk/content_setting_bubble_gtk.cc

Index: chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
index 7366f54df74ef916ec8a24cb515ea12d716260b0..e9a9909e041464f7a389ccb2a9ae3eaac2cc63d1 100644
--- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
@@ -11,6 +11,8 @@
 #include "base/i18n/rtl.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/profiles/profile.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
@@ -108,10 +110,13 @@ void ContentSettingBubbleGtk::BuildBubble() {
   if (!plugins.empty()) {
     GtkWidget* list_content = gtk_vbox_new(FALSE, ui::kControlSpacing);
 
+    PluginFinder* finder = PluginFinder::GetInstance();
     for (std::set<std::string>::const_iterator it = plugins.begin();
         it != plugins.end(); ++it) {
-      std::string name = UTF16ToUTF8(
-          PluginService::GetInstance()->GetPluginGroupName(*it));
+      PluginMetadata* plugin = finder->FindPluginMetadataWithIdentifier(*it);
+      std::string name;

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

Nit: Or

      std::string name(plugin ? UTF16ToUTF8(plugin->name()) : std::string());

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

Done.

+      if (plugin)
+        name = UTF16ToUTF8(plugin->name());
       if (name.empty())
         name = *it;