Remove PluginFinder async interface

chrome/browser/ui/gtk/content_setting_bubble_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/content_setting_bubble_gtk.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #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"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/content_settings.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 77 matching lines @@
     GtkWidget* label = theme_provider->BuildLabel(content.title.c_str(),
                                                   ui::kGdkBlack);
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     gtk_box_pack_start(GTK_BOX(bubble_content), label, FALSE, FALSE, 0);
   }
 
   const std::set<std::string>& plugins = content.resource_identifiers;
   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;
 
       GtkWidget* label = theme_provider->BuildLabel(
           BuildElidedText(name).c_str(), ui::kGdkBlack);
       GtkWidget* label_box = gtk_hbox_new(FALSE, 0);
       gtk_box_pack_start(GTK_BOX(label_box), label, FALSE, FALSE, 0);
 
       gtk_box_pack_start(GTK_BOX(list_content),
                          label_box,
@@ skipping 190 matching lines @@
 
 void ContentSettingBubbleGtk::OnCustomLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnCustomLinkClicked();
   Close();
 }
 
 void ContentSettingBubbleGtk::OnManageLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnManageLinkClicked();
   Close();
 }