Index: content/renderer/pepper_plugin_delegate_impl.cc |
=================================================================== |
--- content/renderer/pepper_plugin_delegate_impl.cc (revision 101488) |
+++ content/renderer/pepper_plugin_delegate_impl.cc (working copy) |
@@ -25,8 +25,8 @@ |
#include "content/common/file_system_messages.h" |
#include "content/common/media/audio_messages.h" |
#include "content/common/pepper_file_messages.h" |
+#include "content/common/pepper_messages.h" |
#include "content/common/pepper_plugin_registry.h" |
-#include "content/common/pepper_messages.h" |
#include "content/common/quota_dispatcher.h" |
#include "content/common/view_messages.h" |
#include "content/renderer/content_renderer_client.h" |
@@ -65,6 +65,7 @@ |
#include "webkit/plugins/ppapi/file_path.h" |
#include "webkit/plugins/ppapi/ppb_file_io_impl.h" |
#include "webkit/plugins/ppapi/plugin_module.h" |
+#include "webkit/plugins/ppapi/ppapi_plugin_info.h" |
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
#include "webkit/plugins/ppapi/ppb_broker_impl.h" |
#include "webkit/plugins/ppapi/ppb_flash_impl.h" |
@@ -685,8 +686,9 @@ |
// In-process plugins will have always been created up-front to avoid the |
// sandbox restrictions. So getting here implies it doesn't exist or should |
// be out of process. |
- const PepperPluginInfo* info = |
- PepperPluginRegistry::GetInstance()->GetInfoForPlugin(webplugin_info); |
+ const webkit::ppapi::PluginInfo* info = |
+ PepperPluginRegistry::GetInstance()->GetInfoForPlugin( |
+ webplugin_info.path); |
if (!info) { |
*pepper_plugin_was_registered = false; |
return scoped_refptr<webkit::ppapi::PluginModule>(); |