Split ppapi::PluginList from PepperPluginRegistry so that DRT could load pepper plugins.

webkit/tools/test_shell/test_shell.cc

Index: webkit/tools/test_shell/test_shell.cc
===================================================================
--- webkit/tools/test_shell/test_shell.cc	(revision 101488)
+++ webkit/tools/test_shell/test_shell.cc	(working copy)
@@ -48,6 +48,7 @@
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 #include "webkit/tools/test_shell/notification_presenter.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
@@ -663,6 +664,17 @@
                 std::vector<webkit::WebPluginInfo>* plugins) {
   if (refresh)
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
+
+  // Pepper plugins.
+  const std::vector<webkit::ppapi::PluginInfo>& ppapi_plugins =
+      webkit::ppapi::PluginList::GetInstance()->plugin_list();
+  for (size_t i = 0; i < ppapi_plugins.size(); ++i) {
+    webkit::WebPluginInfo plugin_info;
+    webkit::ppapi::PepperToWebPluginInfo(ppapi_plugins[i], &plugin_info);
+    webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(plugin_info);
+  }
+  webkit::ppapi::PluginList::GetInstance()->LoadModules();
+
   webkit::npapi::PluginList::Singleton()->GetPlugins(plugins);
   // Don't load the forked TestNetscapePlugIn in the chromium code, use
   // the copy in webkit.org's repository instead.