Remove PluginFinder async interface

chrome/browser/ui/views/content_setting_bubble_contents.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/views/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #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"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/plugin_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/radio_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
@@ skipping 121 matching lines @@
         bubble_content.title));
     layout->StartRow(0, single_column_set_id);
     layout->AddView(title_label);
     bubble_content_empty = false;
   }
 
   const std::set<std::string>& plugins = bubble_content.resource_identifiers;
   if (!plugins.empty()) {
     if (!bubble_content_empty)
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+    PluginFinder* finder = PluginFinder::GetInstance();
     for (std::set<std::string>::const_iterator i(plugins.begin());
          i != plugins.end(); ++i) {
-      string16 name = PluginService::GetInstance()->GetPluginGroupName(*i);
+      PluginMetadata* plugin = finder->FindPluginMetadataWithIdentifier(*i);
+      string16 name;

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

Nit: See comment in GTK

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

Done.

+      if (plugin)
+        name = plugin->name();
       if (name.empty())
         name = UTF8ToUTF16(*i);
       layout->StartRow(0, single_column_set_id);
       layout->AddView(new views::Label(name));
       bubble_content_empty = false;
     }
   }
 
   if (content_setting_bubble_model_->content_type() ==
       CONTENT_SETTINGS_TYPE_POPUPS) {
@@ skipping 150 matching lines @@
 }
 
 void ContentSettingBubbleContents::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED);
   DCHECK(source == content::Source<WebContents>(web_contents_));
   web_contents_ = NULL;
 }