Various changes to make Mojo work under NaCl non-sfi.

mojo/edk/system/node_channel.cc

 // Copyright 2016 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 "mojo/edk/system/node_channel.h"
 
 #include <cstring>
 #include <limits>
 #include <sstream>
 
@@ skipping 138 matching lines @@
 }
 
 }  // namespace
 
 // static
 scoped_refptr<NodeChannel> NodeChannel::Create(
     Delegate* delegate,
     ScopedPlatformHandle platform_handle,
     scoped_refptr<base::TaskRunner> io_task_runner,
     const ProcessErrorCallback& process_error_callback) {
-#if defined(OS_NACL)
-  LOG(FATAL) << "Multi-process not yet supported on NaCl";
+#if defined(OS_NACL_SFI)
+  LOG(FATAL) << "Multi-process not yet supported on NaCl-SFI";
   return nullptr;
 #else
   return new NodeChannel(delegate, std::move(platform_handle), io_task_runner,
                          process_error_callback);
 #endif
 }
 
 // static
 Channel::MessagePtr NodeChannel::CreatePortsMessage(size_t payload_size,
                                                     void** payload,
@@ skipping 248 matching lines @@
 }
 #endif  // defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
 
 NodeChannel::NodeChannel(Delegate* delegate,
                          ScopedPlatformHandle platform_handle,
                          scoped_refptr<base::TaskRunner> io_task_runner,
                          const ProcessErrorCallback& process_error_callback)
     : delegate_(delegate),
       io_task_runner_(io_task_runner),
       process_error_callback_(process_error_callback)
-#if !defined(OS_NACL)
+#if !defined(OS_NACL_SFI)
       , channel_(
           Channel::Create(this, std::move(platform_handle), io_task_runner_))
 #endif
       {
 }
 
 NodeChannel::~NodeChannel() {
   ShutDown();
 }
 
@@ skipping 404 matching lines @@
 
   base::AutoLock lock(channel_lock_);
   if (!channel_)
     DLOG(ERROR) << "Dropping message on closed channel.";
   else
     channel_->Write(std::move(message));
 }
 
 }  // namespace edk
 }  // namespace mojo