Use ChannelMojo for NaCl PPAPI channels.

content/renderer/pepper/host_dispatcher_wrapper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/host_dispatcher_wrapper.h"
 
 #include "build/build_config.h"
 #include "content/common/frame_messages.h"
 #include "content/public/common/origin_util.h"
 #include "content/renderer/pepper/pepper_hung_plugin_filter.h"
@@ skipping 19 matching lines @@
       plugin_child_id_(plugin_child_id),
       permissions_(perms),
       is_external_(is_external) {}
 
 HostDispatcherWrapper::~HostDispatcherWrapper() {}
 
 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.mojo_handle.is_valid()) ?

[Sam McNally, 2016/10/17 23:12:52]

Done (using is_mojo_channel_handle() here and below).

-    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
 
   dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl);
   dispatcher_.reset(new ppapi::proxy::HostDispatcher(
       module_->pp_module(), local_get_interface, permissions_));
   // The HungPluginFilter needs to know when we are blocked on a sync message
   // to the plugin. Note the filter outlives the dispatcher, so there is no
   // need to remove it as an observer.
   dispatcher_->AddSyncMessageStatusObserver(filter.get());
@@ skipping 58 matching lines @@
   if (host) {
     RenderFrame* render_frame = host->GetRenderFrameForInstance(instance);
     if (render_frame) {
       render_frame->Send(new FrameHostMsg_DidDeleteOutOfProcessPepperInstance(
           plugin_child_id_, instance, is_external_));
     }
   }
 }
 
 }  // namespace content