5 files changed, 0 insertions, 34 deletions
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index ffc8d87..58a1447 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_;
 }
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
index 5d3c09f..f5e0d16 100644
--- a/content/browser/plugin_service_impl.h
+++ b/content/browser/plugin_service_impl.h
@@ -52,7 +52,6 @@ struct PepperPluginInfo;
 
 namespace webkit {
 namespace npapi {
-class PluginGroup;
 class PluginList;
 }
 }
@@ -96,8 +95,6 @@ class CONTENT_EXPORT PluginServiceImpl
                                    webkit::WebPluginInfo* info) OVERRIDE;
   virtual string16 GetPluginDisplayNameByPath(const FilePath& path) OVERRIDE;
   virtual void GetPlugins(const GetPluginsCallback& callback) OVERRIDE;
-  virtual void GetPluginGroups(
-      const GetPluginGroupsCallback& callback) OVERRIDE;
   virtual content::PepperPluginInfo* GetRegisteredPpapiPluginInfo(
       const FilePath& plugin_path) OVERRIDE;
   virtual void SetFilter(content::PluginServiceFilter* filter) OVERRIDE;
@@ -111,7 +108,6 @@ class CONTENT_EXPORT PluginServiceImpl
   virtual void UnregisterInternalPlugin(const FilePath& path) OVERRIDE;
   virtual void RegisterInternalPlugin(
       const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
-  virtual string16 GetPluginGroupName(const std::string& plugin_name) OVERRIDE;
   virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE;
   virtual void SetPluginListForTesting(
       webkit::npapi::PluginList* plugin_list) OVERRIDE;
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 46522c0..b408df0 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -59,7 +59,6 @@
 #include "ui/gfx/color_profile.h"
 #include "webkit/glue/webcookie.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/plugin_constants.h"
 #include "webkit/plugins/webplugininfo.h"
diff --git a/content/public/browser/plugin_service.h b/content/public/browser/plugin_service.h
index 2c877c8..891e3bd 100644
--- a/content/public/browser/plugin_service.h
+++ b/content/public/browser/plugin_service.h
@@ -19,7 +19,6 @@ class PluginProcessHost;
 namespace webkit {
 struct WebPluginInfo;
 namespace npapi {
-class PluginGroup;
 class PluginList;
 }
 }
@@ -39,8 +38,6 @@ class PluginService {
  public:
   typedef base::Callback<void(const std::vector<webkit::WebPluginInfo>&)>
       GetPluginsCallback;
-  typedef base::Callback<void(const std::vector<webkit::npapi::PluginGroup>&)>
-      GetPluginGroupsCallback;
 
   // Returns the PluginService singleton.
   CONTENT_EXPORT static PluginService* GetInstance();
@@ -101,10 +98,6 @@ class PluginService {
   // provided function on the calling MessageLoop on completion.
   virtual void GetPlugins(const GetPluginsCallback& callback) = 0;
 
-  // Asynchronously loads the list of plugin groups if necessary and then calls
-  // back to the provided function on the calling MessageLoop on completion.
-  virtual void GetPluginGroups(const GetPluginGroupsCallback& callback) = 0;
-
   // Returns information about a pepper plugin if it exists, otherwise NULL.
   // The caller does not own the pointer, and it's not guaranteed to live past
   // the call stack.
@@ -133,7 +126,6 @@ class PluginService {
   virtual void UnregisterInternalPlugin(const FilePath& path) = 0;
   virtual void RegisterInternalPlugin(const webkit::WebPluginInfo& info,
                                       bool add_at_beginning) = 0;
-  virtual string16 GetPluginGroupName(const std::string& plugin_name) = 0;
 
   // TODO(dpranke): This should be private.
   virtual webkit::npapi::PluginList* GetPluginList() = 0;
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 7793797..b9f42b7 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -49,7 +49,6 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/plugin_group.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/plugin_constants.h"
 #include "webkit/plugins/sad_plugin.h"