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..034dadc1260f672e9feaae078898c366b18ab56f 100644 |
--- a/content/renderer/pepper/host_dispatcher_wrapper.cc |
+++ b/content/renderer/pepper/host_dispatcher_wrapper.cc |
@@ -41,8 +41,9 @@ bool HostDispatcherWrapper::Init(const IPC::ChannelHandle& 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.mojo_handle.is_valid()); |
Mark Seaborn
2016/10/12 00:57:24
Presumably this shouldn't be conditional on OS_POS
Sam McNally
2016/10/12 03:15:32
Allowing non-ChannelMojo handles is still necessar
Mark Seaborn
2016/10/13 21:27:51
OK. My comment still stands for other places wher
Sam McNally
2016/10/14 02:35:02
Done. ChannelHandle shouldn't even allow this, but
|
+ if (channel_handle.socket.fd == -1 && !channel_handle.mojo_handle.is_valid()) |
return false; |
#endif |