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

ipc/mojo/ipc_mojo_bootstrap.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 "ipc/mojo/ipc_mojo_bootstrap.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 136 matching lines @@
                          Delegate* delegate) {
   handle_ = std::move(handle);
   delegate_ = delegate;
 }
 
 base::ProcessId MojoBootstrap::GetSelfPID() const {
 #if defined(OS_LINUX)
   if (int global_pid = Channel::GetGlobalPid())
     return global_pid;
 #endif  // OS_LINUX
+#if defined(OS_NACL)
+  return -1;
+#else
   return base::GetCurrentProcId();
+#endif  // defined(OS_NACL)
 }
 
 void MojoBootstrap::Fail() {
   set_state(STATE_ERROR);
   delegate()->OnBootstrapError();
 }
 
 bool MojoBootstrap::HasFailed() const {
   return state() == STATE_ERROR;
 }
 
 mojo::ScopedMessagePipeHandle MojoBootstrap::TakeHandle() {
   return std::move(handle_);
 }
 
 }  // namespace IPC