Update from https://crrev.com/320343

sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc

 // Copyright 2015 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 <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <sched.h>
 #include <signal.h>
 #include <sys/prctl.h>
@@ skipping 539 matching lines @@
   BPF_ASSERT(*BPF_AUX == 3);
   BPF_ASSERT(*name);
 }
 
 SANDBOX_TEST(SandboxBPF, EnableUnsafeTrapsInSigSysHandler) {
   // Disabling warning messages that could confuse our test framework.
   setenv(kSandboxDebuggingEnv, "t", 0);
   Die::SuppressInfoMessages(true);
 
   unsetenv(kSandboxDebuggingEnv);
-  SANDBOX_ASSERT(Trap::EnableUnsafeTrapsInSigSysHandler() == false);
+  SANDBOX_ASSERT(Trap::Registry()->EnableUnsafeTraps() == false);
   setenv(kSandboxDebuggingEnv, "", 1);
-  SANDBOX_ASSERT(Trap::EnableUnsafeTrapsInSigSysHandler() == false);
+  SANDBOX_ASSERT(Trap::Registry()->EnableUnsafeTraps() == false);
   setenv(kSandboxDebuggingEnv, "t", 1);
-  SANDBOX_ASSERT(Trap::EnableUnsafeTrapsInSigSysHandler() == true);
+  SANDBOX_ASSERT(Trap::Registry()->EnableUnsafeTraps() == true);
 }
 
 intptr_t PrctlHandler(const struct arch_seccomp_data& args, void*) {
   if (args.args[0] == PR_CAPBSET_DROP && static_cast<int>(args.args[1]) == -1) {
     // prctl(PR_CAPBSET_DROP, -1) is never valid. The kernel will always
     // return an error. But our handler allows this call.
     return 0;
   } else {
     return SandboxBPF::ForwardSyscall(args);
   }
@@ skipping 1675 matching lines @@
   BPF_ASSERT_EQ(ENOSYS, errno);
 
   BPF_ASSERT_EQ(-1, syscall(__NR_setgid, 300));
   BPF_ASSERT_EQ(EPERM, errno);
 }
 
 }  // namespace
 
 }  // namespace bpf_dsl
 }  // namespace sandbox