Chromium Code Reviews| 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..da121a43b6c33fff0b89ee15ba8f4ba08d87a7ec 100644 |
| --- a/content/renderer/pepper/host_dispatcher_wrapper.cc |
| +++ b/content/renderer/pepper/host_dispatcher_wrapper.cc |
| @@ -37,12 +37,10 @@ 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()) |
|
raymes
2016/10/17 23:07:23
if (channel_handle.name.empty() && !channel_handle
Sam McNally
2016/10/17 23:12:52
Done (using is_mojo_channel_handle() here and belo
|
| - 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.mojo_handle.is_valid()); |
| + if (channel_handle.socket.fd == -1 && !channel_handle.mojo_handle.is_valid()) |
| return false; |
| #endif |