| Index: chrome/renderer/pepper/ppb_nacl_private_impl.cc
|
| diff --git a/chrome/renderer/pepper/ppb_nacl_private_impl.cc b/chrome/renderer/pepper/ppb_nacl_private_impl.cc
|
| index bb5abf6ee04332a94a9826a714f9ac6cfff66165..ab0801adfcdca24a1517e5e92237acf2a2f6cef4 100644
|
| --- a/chrome/renderer/pepper/ppb_nacl_private_impl.cc
|
| +++ b/chrome/renderer/pepper/ppb_nacl_private_impl.cc
|
| @@ -42,9 +42,10 @@ base::LazyInstance<scoped_refptr<IPC::SyncMessageFilter> >
|
| g_background_thread_sender = LAZY_INSTANCE_INITIALIZER;
|
|
|
| struct InstanceInfo {
|
| - InstanceInfo() : plugin_child_id(0) {}
|
| + InstanceInfo() : plugin_pid(base::kNullProcessId), plugin_child_id(0) {}
|
| GURL url;
|
| ppapi::PpapiPermissions permissions;
|
| + base::ProcessId plugin_pid;
|
| int plugin_child_id;
|
| IPC::ChannelHandle channel_handle;
|
| };
|
| @@ -105,6 +106,7 @@ PP_NaClResult LaunchSelLdr(PP_Instance instance,
|
| perm_bits,
|
| socket_count, &sockets,
|
| &instance_info.channel_handle,
|
| + &instance_info.plugin_pid,
|
| &instance_info.plugin_child_id))) {
|
| return PP_NACL_FAILED;
|
| }
|
| @@ -159,6 +161,7 @@ PP_NaClResult StartPpapiProxy(PP_Instance instance) {
|
| FilePath().AppendASCII(instance_info.url.spec()),
|
| instance_info.permissions,
|
| instance_info.channel_handle,
|
| + instance_info.plugin_pid,
|
| instance_info.plugin_child_id);
|
| if (!renderer_ppapi_host)
|
| return PP_NACL_ERROR_MODULE;
|
|
|