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

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/user_agent.h"
 #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"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_devtools_agent.h"
 #include "webkit/tools/test_shell/test_shell_devtools_client.h"
 #include "webkit/tools/test_shell/test_shell_request_context.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 595 matching lines @@
 bool GetFontTable(int fd, uint32_t table, uint8_t* output,
                   size_t* output_length) {
   return false;
 }
 #endif
 
 void GetPlugins(bool refresh,
                 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.
   const FilePath::StringType kPluginBlackList[] = {
     FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"),
     FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"),
     FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"),
   };
   for (int i = plugins->size() - 1; i >= 0; --i) {
     webkit::WebPluginInfo plugin_info = plugins->at(i);
     for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
       if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
         plugins->erase(plugins->begin() + i);
       }
     }
   }
 }
 
 }  // namespace webkit_glue