Revert r108760 / reland r108744, r108753 w/ fix

content/plugin/plugin_thread.cc

Index: content/plugin/plugin_thread.cc
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index 195bffe5767df2f34869ee557e3a809c12a1d1ab..7951a8f4a43484b5d8dc493f0bde6c4d2ee0f848 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -27,6 +27,7 @@
 #include "ipc/ipc_channel_handle.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #if defined(TOOLKIT_USES_GTK)
@@ -114,6 +115,9 @@ PluginThread::PluginThread()
   content::GetContentClient()->plugin()->PluginProcessStarted(
       plugin.get() ? plugin->plugin_info().name : string16());
 
+  content::GetContentClient()->AddNPAPIPlugins(
+      webkit::npapi::PluginList::Singleton());
+
   // Certain plugins, such as flash, steal the unhandled exception filter
   // thus we never get crash reports when they fault. This call fixes it.
   message_loop()->set_exception_restoration(true);