Use ChannelMojo for NaCl IRT channels in non-sfi mode.

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"
@@ skipping 10 matching lines @@
 
 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());
 }
 
 // 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 80 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