Non-SFI NaCl: Disallow epoll family and allow poll instead

components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc

Index: components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc
diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc b/components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc
index 15c6d386d7f28148d3688f04ceb2966243fb880a..0aeed40d2492d952a3ee3805a927102d6f23abd3 100644
--- a/components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc
+++ b/components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc
@@ -84,10 +84,12 @@ RESTRICT_SYSCALL_DEATH_TEST(create_module);
 RESTRICT_SYSCALL_DEATH_TEST(delete_module);
 RESTRICT_SYSCALL_DEATH_TEST(dup3);
 RESTRICT_SYSCALL_DEATH_TEST(epoll_create1);
+RESTRICT_SYSCALL_DEATH_TEST(epoll_ctl);
 #if defined(__x86_64__)
 RESTRICT_SYSCALL_DEATH_TEST(epoll_ctl_old);
 #endif
 RESTRICT_SYSCALL_DEATH_TEST(epoll_pwait);
+RESTRICT_SYSCALL_DEATH_TEST(epoll_wait);
 #if defined(__x86_64__)
 RESTRICT_SYSCALL_DEATH_TEST(epoll_wait_old);
 #endif
@@ -326,7 +328,6 @@ RESTRICT_SYSCALL_DEATH_TEST(perf_event_open);
 RESTRICT_SYSCALL_DEATH_TEST(personality);
 RESTRICT_SYSCALL_DEATH_TEST(pipe2);
 RESTRICT_SYSCALL_DEATH_TEST(pivot_root);
-RESTRICT_SYSCALL_DEATH_TEST(poll);
 RESTRICT_SYSCALL_DEATH_TEST(ppoll);
 RESTRICT_SYSCALL_DEATH_TEST(preadv);
 RESTRICT_SYSCALL_DEATH_TEST(prlimit64);