| Index: content/renderer/pepper/host_dispatcher_wrapper.cc
|
| diff --git a/content/renderer/pepper/host_dispatcher_wrapper.cc b/content/renderer/pepper/host_dispatcher_wrapper.cc
|
| index 88d567a5cdb77d89db20998549ce965ca0e6c96b..1aebef90c6a407c3bb5a622f67d8335daf710abe 100644
|
| --- a/content/renderer/pepper/host_dispatcher_wrapper.cc
|
| +++ b/content/renderer/pepper/host_dispatcher_wrapper.cc
|
| @@ -37,13 +37,16 @@ bool HostDispatcherWrapper::Init(const IPC::ChannelHandle& channel_handle,
|
| PP_GetInterface_Func local_get_interface,
|
| const ppapi::Preferences& preferences,
|
| scoped_refptr<PepperHungPluginFilter> filter) {
|
| - if (channel_handle.name.empty())
|
| + if (channel_handle.name.empty() && !channel_handle.is_mojo_channel_handle())
|
| return false;
|
|
|
| #if defined(OS_POSIX)
|
| - DCHECK_NE(-1, channel_handle.socket.fd);
|
| - if (channel_handle.socket.fd == -1)
|
| + DCHECK(channel_handle.socket.fd != -1 ||
|
| + channel_handle.is_mojo_channel_handle());
|
| + if (channel_handle.socket.fd == -1 &&
|
| + !channel_handle.is_mojo_channel_handle()) {
|
| return false;
|
| + }
|
| #endif
|
|
|
| dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl);
|
|
|