Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0

components/nacl/loader/nacl_listener.cc

 // Copyright 2013 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 "components/nacl/loader/nacl_listener.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 17 matching lines @@
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "mojo/nacl/mojo_syscall.h"
 #include "native_client/src/public/chrome_main.h"
 #include "native_client/src/public/nacl_app.h"
 #include "native_client/src/public/nacl_desc.h"
 #include "native_client/src/public/nacl_file_info.h"
 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
 #include "third_party/mojo/src/mojo/edk/embedder/platform_support.h"
+#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "content/public/common/child_process_sandbox_support_linux.h"
 #endif
 
 #if defined(OS_WIN)
@@ skipping 378 matching lines @@
       params.nexe_file);
   std::string file_path_str = params.nexe_file_path_metadata.AsUTF8Unsafe();
   args->nexe_desc = NaClDescCreateWithFilePathMetadata(nexe_file,
                                                        file_path_str.c_str());
 
 #if defined(OS_POSIX)
   if (params.enable_mojo) {
 #if !defined(OS_MACOSX)
     // Don't call mojo::embedder::Init on Mac; it's already been called from
     // ChromeMain() (see chrome/app/chrome_exe_main_mac.cc).
-    mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>());
+    mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(

[jamesr, 2015/02/06 22:31:38]

nit: you can just say make_scoped_ptr(new mojo::....), scoped_ptr<T> can be
rvalue-constructed from scoped_ptr<U> when U is a subclass of T

[viettrungluu, 2015/02/07 00:14:31]

Done.

+        new mojo::embedder::SimplePlatformSupport()));
 #endif
     // InjectMojo adds a file descriptor to the process that allows Mojo calls
     // to use an implementation defined outside the NaCl sandbox. See
     // //mojo/nacl for implementation details.
     InjectMojo(nap);
   } else {
     // When Mojo isn't enabled, we inject a file descriptor that intentionally
     // fails on any imc_sendmsg() call to make debugging easier.
     InjectDisabledMojo(nap);
   }
@@ skipping 22 matching lines @@
 }
 
 void NaClListener::OnFileTokenResolved(
     uint64_t token_lo,
     uint64_t token_hi,
     IPC::PlatformFileForTransit ipc_fd,
     base::FilePath file_path) {
   resolved_cb_.Run(ipc_fd, file_path);
   resolved_cb_.Reset();
 }