| Index: content/browser/plugin_service_impl.cc
|
| diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
|
| index ffc8d8772c00bad4bd097cb65632fdd6a1643ee5..58a1447251e205d6e04bf4cc828d38bb560e2252 100644
|
| --- a/content/browser/plugin_service_impl.cc
|
| +++ b/content/browser/plugin_service_impl.cc
|
| @@ -31,7 +31,6 @@
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/process_type.h"
|
| #include "webkit/plugins/npapi/plugin_constants_win.h"
|
| -#include "webkit/plugins/npapi/plugin_group.h"
|
| #include "webkit/plugins/npapi/plugin_list.h"
|
| #include "webkit/plugins/webplugininfo.h"
|
|
|
| @@ -45,16 +44,6 @@ using content::PluginServiceFilter;
|
|
|
| namespace {
|
|
|
| -// A callback for GetPlugins() that then gets the freshly loaded plugin groups
|
| -// and runs the callback for GetPluginGroups().
|
| -static void GetPluginsForGroupsCallback(
|
| - const PluginService::GetPluginGroupsCallback& callback,
|
| - const std::vector<webkit::WebPluginInfo>& plugins) {
|
| - std::vector<webkit::npapi::PluginGroup> groups;
|
| - webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, &groups);
|
| - callback.Run(groups);
|
| -}
|
| -
|
| // Callback set on the PluginList to assert that plugin loading happens on the
|
| // correct thread.
|
| #if defined(OS_WIN)
|
| @@ -538,11 +527,6 @@ void PluginServiceImpl::GetPlugins(const GetPluginsCallback& callback) {
|
| #endif
|
| }
|
|
|
| -void PluginServiceImpl::GetPluginGroups(
|
| - const GetPluginGroupsCallback& callback) {
|
| - GetPlugins(base::Bind(&GetPluginsForGroupsCallback, callback));
|
| -}
|
| -
|
| #if defined(OS_WIN)
|
| void PluginServiceImpl::GetPluginsInternal(
|
| base::MessageLoopProxy* target_loop,
|
| @@ -716,10 +700,6 @@ void PluginServiceImpl::RegisterInternalPlugin(
|
| plugin_list_->RegisterInternalPlugin(info, add_at_beginning);
|
| }
|
|
|
| -string16 PluginServiceImpl::GetPluginGroupName(const std::string& plugin_name) {
|
| - return plugin_list_->GetPluginGroupName(plugin_name);
|
| -}
|
| -
|
| webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
|
| return plugin_list_;
|
| }
|
|
|