| 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 5f3cdfe0e2f9f31904642558a42021ff4ade95f4..59bfc872d0d534f9a8a32b0fef9fd6ae0f07e45e 100644
|
| --- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
|
| +++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc
|
| @@ -18,6 +18,7 @@ BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
|
| IPC::Sender* sender,
|
| ppapi::PpapiPermissions permissions,
|
| base::ProcessHandle plugin_child_process,
|
| + ProcessType plugin_child_process_type,
|
| IPC::ChannelProxy* channel,
|
| net::HostResolver* host_resolver,
|
| int render_process_id,
|
| @@ -29,11 +30,12 @@ BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
|
| FilePath profile_data_directory;
|
| BrowserPpapiHostImpl* browser_ppapi_host =
|
| new BrowserPpapiHostImpl(sender, permissions, plugin_name,
|
| - profile_data_directory);
|
| + profile_data_directory,
|
| + plugin_child_process_type);
|
| browser_ppapi_host->set_plugin_process_handle(plugin_child_process);
|
|
|
| channel->AddFilter(
|
| - new PepperMessageFilter(PepperMessageFilter::NACL,
|
| + new PepperMessageFilter(plugin_child_process_type,
|
| permissions,
|
| host_resolver,
|
| render_process_id,
|
| @@ -48,11 +50,13 @@ BrowserPpapiHostImpl::BrowserPpapiHostImpl(
|
| IPC::Sender* sender,
|
| const ppapi::PpapiPermissions& permissions,
|
| const std::string& plugin_name,
|
| - const FilePath& profile_data_directory)
|
| + const FilePath& profile_data_directory,
|
| + ProcessType plugin_process_type)
|
| : ppapi_host_(new ppapi::host::PpapiHost(sender, permissions)),
|
| plugin_process_handle_(base::kNullProcessHandle),
|
| plugin_name_(plugin_name),
|
| - profile_data_directory_(profile_data_directory) {
|
| + profile_data_directory_(profile_data_directory),
|
| + plugin_process_type_(plugin_process_type) {
|
| message_filter_ = new HostMessageFilter(ppapi_host_.get());
|
| ppapi_host_->AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory>(
|
| new ContentBrowserPepperHostFactory(this)));
|
|
|