| 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 b03c885c3f17487730abde7ec25049dae7a6976f..c8d74b29b7a7a9a2c89cbb74062d4d077c6ab5fe 100644
|
| --- a/components/nacl/loader/nacl_helper_linux.cc
|
| +++ b/components/nacl/loader/nacl_helper_linux.cc
|
| @@ -32,6 +32,7 @@
|
| #include "components/nacl/common/nacl_switches.h"
|
| #include "components/nacl/loader/nacl_listener.h"
|
| #include "components/nacl/loader/nacl_sandbox_linux.h"
|
| +#include "components/nacl/loader/nonsfi/irt_exception_handling.h"
|
| #include "content/public/common/zygote_fork_delegate_linux.h"
|
| #include "crypto/nss_util.h"
|
| #include "ipc/ipc_descriptors.h"
|
| @@ -121,6 +122,9 @@ void BecomeNaClLoader(const std::vector<int>& child_fds,
|
| // don't need zygote FD any more
|
| if (IGNORE_EINTR(close(kNaClZygoteDescriptor)) != 0)
|
| LOG(ERROR) << "close(kNaClZygoteDescriptor) failed.";
|
| + if (uses_nonsfi_mode) {
|
| + nacl::nonsfi::InitializeSignalHandler();
|
| + }
|
| InitializeLayerTwoSandbox(uses_nonsfi_mode);
|
| base::GlobalDescriptors::GetInstance()->Set(
|
| kPrimaryIPCChannel,
|
|
|