Linux: Revert r33888. We no longer need to collect the list of loaded plugins since we do not unload them now, thus they already show up in the module list.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/551122

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36937 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 33 deletions

diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index ec4a80b..f7643b4 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -15,13 +15,6 @@
 #include "webkit/glue/webkit_glue.h"
 #include "googleurl/src/gurl.h"
 
-#if defined(USE_LINUX_BREAKPAD)
-namespace {
-// Comma-separated list of loaded plugin filenames.
-std::string loaded_plugin_list;
-}  // anonymous namespace
-#endif
-
 namespace NPAPI {
 
 base::LazyInstance<PluginList> g_singleton(base::LINKER_INITIALIZED);
@@ -81,14 +74,7 @@ bool PluginList::ReadPluginInfo(const FilePath &filename,
   // Not an internal plugin.
   *entry_points = NULL;
 
-  bool ret = PluginLib::ReadWebPluginInfo(filename, info);
-
-#if defined(USE_LINUX_BREAKPAD)
-  if (ret)
-    loaded_plugin_list.append(filename.BaseName().value() + ",");
-#endif
-
-  return ret;
+  return PluginLib::ReadWebPluginInfo(filename, info);
 }
 
 bool PluginList::CreateWebPluginInfo(const PluginVersionInfo& pvi,
@@ -175,10 +161,6 @@ void PluginList::LoadPlugins(bool refresh) {
     internal_plugins = internal_plugins_;
   }
 
-#if defined(USE_LINUX_BREAKPAD)
-  loaded_plugin_list.clear();
-#endif
-
   base::TimeTicks start_time = base::TimeTicks::Now();
 
   std::vector<WebPluginInfo> new_plugins;
@@ -366,13 +348,4 @@ void PluginList::Shutdown() {
   // TODO
 }
 
-#if defined(USE_LINUX_BREAKPAD)
-// static
-// WARNING: This is called when we are in the middle of a browser crash.
-// This function may not call into libc nor allocate memory.
-std::string* PluginList::GetLoadedPlugins() {
-  return &loaded_plugin_list;
-}
-#endif
-
 }  // namespace NPAPI
diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h
index e16f5ea..9987553 100644
--- a/webkit/glue/plugins/plugin_list.h
+++ b/webkit/glue/plugins/plugin_list.h
@@ -130,11 +130,6 @@ class PluginList {
   void LoadPlugin(const FilePath& filename,
                   std::vector<WebPluginInfo>* plugins);
 
-#if defined(USE_LINUX_BREAKPAD)
-  // Get a comma separated string with the list of successfully loaded plugins.
-  static std::string* GetLoadedPlugins();
-#endif
-
  private:
   // Constructors are private for singletons
   PluginList();