Use ChannelMojo for NaCl PPAPI channels.

ppapi/nacl_irt/plugin_startup.cc

 // Copyright 2014 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 "ppapi/nacl_irt/plugin_startup.h"
 
 #include "base/bind.h"
 #include "base/file_descriptor_posix.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ppapi/nacl_irt/manifest_service.h"
 #include "ppapi/shared_impl/ppb_audio_shared.h"
 
 namespace ppapi {
 namespace {
 
 IPC::ChannelHandle* g_nacl_browser_ipc_handle = nullptr;
 IPC::ChannelHandle* g_nacl_renderer_ipc_handle = nullptr;
 IPC::ChannelHandle* g_manifest_service_handle = nullptr;
 
 base::WaitableEvent* g_shutdown_event = NULL;
 base::Thread* g_io_thread = NULL;
 ManifestService* g_manifest_service = NULL;
 
 bool IsValidChannelHandle(IPC::ChannelHandle* handle) {
-  // ChannelMojo not yet supported.
-  return handle && handle->socket.fd != -1 && !handle->mojo_handle.is_valid();
+  return handle && (handle->socket.fd != -1 || handle->mojo_handle.is_valid());

[Mark Seaborn, 2016/10/13 21:27:51]

Shouldn't this only accept Mojo handles?

[Sam McNally, 2016/10/14 02:35:03]

It's used by both SFI and non-SFI. In SFI mode they still look like FDs. I've
added ifdefs to make it clearer.

 }
 
 // Creates the manifest service on IO thread so that its Listener's thread and
 // IO thread are shared. Upon completion of the manifest service creation,
 // event is signaled.
 void StartUpManifestServiceOnIOThread(base::WaitableEvent* event) {
   // The start up must be called only once.
   DCHECK(!g_manifest_service);
   // manifest_service_handle must be set.
   DCHECK(IsValidChannelHandle(g_manifest_service_handle));
@@ skipping 73 matching lines @@
   // The IOThread must be initialized in advance.
   DCHECK(g_io_thread);
   return g_io_thread;
 }
 
 ManifestService* GetManifestService() {
   return g_manifest_service;
 }
 
 }  // namespace ppapi