| Index: chrome/browser/nacl_host/nacl_process_host.cc
|
| diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
|
| index 1c7d5f388dacf383ffbbc057bebd987a1fce9dcc..3f0135960c0cc79b9f4002744456eab6920a68bc 100644
|
| --- a/chrome/browser/nacl_host/nacl_process_host.cc
|
| +++ b/chrome/browser/nacl_host/nacl_process_host.cc
|
| @@ -38,6 +38,7 @@
|
| #include "content/public/browser/browser_ppapi_host.h"
|
| #include "content/public/browser/child_process_data.h"
|
| #include "content/public/common/child_process_host.h"
|
| +#include "content/public/common/process_type.h"
|
| #include "extensions/common/constants.h"
|
| #include "extensions/common/url_pattern.h"
|
| #include "ipc/ipc_channel.h"
|
| @@ -777,6 +778,8 @@ void NaClProcessHost::OnPpapiChannelCreated(
|
| // If the proxy channel is null, this must be the initial NaCl-Browser IPC
|
| // channel.
|
| if (!ipc_proxy_channel_.get()) {
|
| + DCHECK_EQ(content::PROCESS_TYPE_NACL_LOADER, process_->GetData().type);
|
| +
|
| ipc_proxy_channel_.reset(
|
| new IPC::ChannelProxy(channel_handle,
|
| IPC::Channel::MODE_CLIENT,
|
| @@ -785,7 +788,7 @@ void NaClProcessHost::OnPpapiChannelCreated(
|
| // Create the browser ppapi host and enable PPAPI message dispatching to the
|
| // browser process.
|
| ppapi_host_.reset(content::BrowserPpapiHost::CreateExternalPluginProcess(
|
| - ipc_proxy_channel_.get(), //process_.get(), // sender
|
| + ipc_proxy_channel_.get(), // sender
|
| permissions_,
|
| process_->GetData().handle,
|
| ipc_proxy_channel_.get(),
|
|
|