Remove PluginFinder async interface

chrome/browser/pepper_broker_observer.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/pepper_broker_observer.h"
 
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
+#include "chrome/browser/plugins/plugin_finder.h"
+#include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
 
 // The URL for the "learn more" article about the PPAPI broker.
@@ skipping 56 matching lines @@
   if (!callback_.is_null())
     callback_.Run(false);
 }
 
 string16 PepperBrokerInfoBarDelegate::GetMessageText() const {
   content::PluginService* plugin_service =
       content::PluginService::GetInstance();
   webkit::WebPluginInfo plugin;
   bool success = plugin_service->GetPluginInfoByPath(plugin_path_, &plugin);
   DCHECK(success);
-  scoped_ptr<webkit::npapi::PluginGroup> plugin_group(
-      plugin_service->GetPluginList()->GetPluginGroup(plugin));
+  PluginMetadata* plugin_metadata =
+      PluginFinder::GetInstance()->GetPluginMetadata(plugin);
   return l10n_util::GetStringFUTF16(IDS_PEPPER_BROKER_MESSAGE,
-                                    plugin_group->GetGroupName(),
+                                    plugin_metadata->name(),
                                     net::FormatUrl(url_.GetOrigin(),
                                                    languages_));
 }
 
 int PepperBrokerInfoBarDelegate::GetButtons() const {
   return BUTTON_OK | BUTTON_CANCEL;
 }
 
 string16 PepperBrokerInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
@@ skipping 105 matching lines @@
               infobar_helper, url, plugin_path, languages, content_settings,
               callback));
       break;
     }
     default:
       NOTREACHED();
   }
 
   return true;
 }