| Index: components/nacl/loader/nacl_helper_linux.cc
|
| diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
|
| index 9853507c322b740482fe0e1c79724fcbac929ca9..adb6d8b9c64abbdf563e149d10a588571d410b47 100644
|
| --- a/components/nacl/loader/nacl_helper_linux.cc
|
| +++ b/components/nacl/loader/nacl_helper_linux.cc
|
| @@ -42,11 +42,6 @@
|
| #include "ipc/ipc_descriptors.h"
|
| #include "ipc/ipc_switches.h"
|
| #include "sandbox/linux/services/libc_urandom_override.h"
|
| -
|
| -#if !defined(OS_NACL_NONSFI)
|
| -#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h"
|
| -#endif
|
|
|
| #if defined(OS_NACL_NONSFI)
|
| #include "native_client/src/public/nonsfi/irt_exception_handling.h"
|
| @@ -462,12 +457,6 @@
|
| CheckRDebug(argv[0]);
|
| #endif
|
|
|
| -// TODO(teravest): Enable mojo for nonsfi. http://crbug.com/473418
|
| -#if !defined(OS_NACL_NONSFI)
|
| - mojo::embedder::Init(
|
| - make_scoped_ptr(new mojo::embedder::SimplePlatformSupport()));
|
| -#endif
|
| -
|
| scoped_ptr<nacl::NaClSandbox> nacl_sandbox(new nacl::NaClSandbox);
|
| // Make sure that the early initialization did not start any spurious
|
| // threads.
|
|
|