Use ChannelMojo for NaCl PPAPI channels.

ipc/ipc_channel_handle.h

 // 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.
 
 #ifndef IPC_IPC_CHANNEL_HANDLE_H_
 #define IPC_IPC_CHANNEL_HANDLE_H_
 
 #include <string>
 
 #include "build/build_config.h"
@@ skipping 32 matching lines @@
   ChannelHandle(const std::string& n) : name(n) {}
   ChannelHandle(const char* n) : name(n) {}
 #if defined(OS_WIN)
   explicit ChannelHandle(HANDLE h) : pipe(h) {}
 #elif defined(OS_POSIX)
   ChannelHandle(const std::string& n, const base::FileDescriptor& s)
       : name(n), socket(s) {}
 #endif  // defined(OS_POSIX)
   ChannelHandle(mojo::MessagePipeHandle h) : mojo_handle(h) {}
 
+  bool is_mojo_channel_handle() const {
+#if defined(OS_WIN)
+    if (pipe.handle)
+      return false;
+#elif defined(OS_POSIX)
+    if (socket.fd != -1)
+      return false;
+#endif  // defined(OS_POSIX)
+    return mojo_handle.is_valid();

[Mark Seaborn, 2016/10/17 21:28:26]

How about also: "&& name.empty()"

[Sam McNally, 2016/10/17 23:01:17]

Done.

+  }
+
   std::string name;
 #if defined(OS_POSIX)
   base::FileDescriptor socket;
 #elif defined(OS_WIN)
   // A simple container to automatically initialize pipe handle
   struct PipeHandle {
     PipeHandle() : handle(NULL) {}
     PipeHandle(HANDLE h) : handle(h) {}
     HANDLE handle;
   };
   PipeHandle pipe;
 #endif  // defined (OS_WIN)
   mojo::MessagePipeHandle mojo_handle;
 };
 
 }  // namespace IPC
 
 #endif  // IPC_IPC_CHANNEL_HANDLE_H_