Index: content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc |
diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc |
index 10eef8b55159979b94bbeca45a74493f7f0659fe..548aa4dcb903fc777367b0914a4e785821fda472 100644 |
--- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc |
+++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc |
@@ -4,6 +4,7 @@ |
#include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" |
+#include "content/browser/renderer_host/pepper/pepper_message_filter.h" |
#include "content/browser/tracing/trace_message_filter.h" |
#include "content/common/pepper_renderer_instance_data.h" |
#include "content/public/browser/render_view_host.h" |
@@ -18,24 +19,16 @@ BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess( |
ppapi::PpapiPermissions permissions, |
base::ProcessHandle plugin_child_process, |
IPC::ChannelProxy* channel, |
- net::HostResolver* host_resolver, |
int render_process_id, |
int render_view_id, |
const base::FilePath& profile_directory) { |
- scoped_refptr<PepperMessageFilter> pepper_message_filter( |
- new PepperMessageFilter(permissions, |
- host_resolver, |
- render_process_id, |
- render_view_id)); |
- |
// The plugin name and path shouldn't be needed for external plugins. |
BrowserPpapiHostImpl* browser_ppapi_host = |
new BrowserPpapiHostImpl(sender, permissions, std::string(), |
- base::FilePath(), profile_directory, true, |
- pepper_message_filter); |
+ base::FilePath(), profile_directory, true); |
browser_ppapi_host->set_plugin_process_handle(plugin_child_process); |
- channel->AddFilter(pepper_message_filter); |
+ channel->AddFilter(PepperMessageFilter::CreateExternal(permissions)); |
yzshen1
2013/08/16 20:40:42
You should still put it in a scoped_refptr<> befor
ygorshenin1
2013/08/19 14:33:35
Done.
|
channel->AddFilter(browser_ppapi_host->message_filter().get()); |
channel->AddFilter(new TraceMessageFilter()); |
@@ -48,8 +41,7 @@ BrowserPpapiHostImpl::BrowserPpapiHostImpl( |
const std::string& plugin_name, |
const base::FilePath& plugin_path, |
const base::FilePath& profile_data_directory, |
- bool external_plugin, |
- const scoped_refptr<PepperMessageFilter>& pepper_message_filter) |
+ bool external_plugin) |
: ppapi_host_(new ppapi::host::PpapiHost(sender, permissions)), |
plugin_process_handle_(base::kNullProcessHandle), |
plugin_name_(plugin_name), |
@@ -58,7 +50,7 @@ BrowserPpapiHostImpl::BrowserPpapiHostImpl( |
external_plugin_(external_plugin) { |
message_filter_ = new HostMessageFilter(ppapi_host_.get()); |
ppapi_host_->AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory>( |
- new ContentBrowserPepperHostFactory(this, pepper_message_filter))); |
+ new ContentBrowserPepperHostFactory(this))); |
} |
BrowserPpapiHostImpl::~BrowserPpapiHostImpl() { |