| 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 adb6d8b9c64abbdf563e149d10a588571d410b47..9853507c322b740482fe0e1c79724fcbac929ca9 100644 | 
| --- a/components/nacl/loader/nacl_helper_linux.cc | 
| +++ b/components/nacl/loader/nacl_helper_linux.cc | 
| @@ -43,6 +43,11 @@ | 
| #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" | 
| #else | 
| @@ -457,6 +462,12 @@ int main(int argc, char* argv[]) { | 
| 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. | 
|  |