Fix duplicate symbol in ARM build of nacl_helper_nonsfi_unittests

components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc

Index: components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
index 53ea1ab94afce7a24bf3ee1f0bf23e8378065cd6..c69ccb6ca372b708c8aac573304b7a6f431c49af 100644
--- a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
+++ b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
@@ -200,7 +200,7 @@ BPF_DEATH_TEST_C(NaClNonSfiSandboxTest,
   syscall(__NR_prctl, PR_SET_DUMPABLE, 1UL);
 }
 
-#if defined(OS_NACL_NONSFI)
+#if defined(OS_NACL_NONSFI) || defined(__x86_64__) || defined(__arm__)
 BPF_DEATH_TEST_C(NaClNonsfiSandboxTest,
                  socketpair,

[Mark Seaborn, 2015/05/27 21:40:35]

Rather than your current change...

Maybe rename to socketpair_af_unix_disallowed, to avoid the clash?

[Sam Clegg, 2015/05/27 22:30:20]

Done.

                  DEATH_SEGV_MESSAGE(sandbox::GetErrorMessageContentForTests()),
@@ -208,7 +208,9 @@ BPF_DEATH_TEST_C(NaClNonsfiSandboxTest,
   int tmp_fds[2];
   socketpair(AF_UNIX, SOCK_STREAM, 0, tmp_fds);
 }
-#else
+#endif
+
+#if !defined(OS_NACL_NONSFI)
 BPF_TEST_C(NaClNonSfiSandboxTest,
            socketcall_allowed,
            nacl::nonsfi::NaClNonSfiBPFSandboxPolicy) {
@@ -393,16 +395,6 @@ BPF_DEATH_TEST_C(NaClNonSfiSandboxTest,
 #endif
 }
 
-#if defined(__x86_64__) || defined(__arm__)

[Mark Seaborn, 2015/05/27 21:40:35]

Maybe add comment to explain background:

The arguments to socketpair() are passed in registers on these architectures and
so can be filtered.  We don't apply this check on x86-32 where the arguments are
passed in memory.

[Sam Clegg, 2015/05/27 22:30:20]

Done.

-BPF_DEATH_TEST_C(NaClNonSfiSandboxTest,
-                 socketpair,

[Mark Seaborn, 2015/05/27 21:40:35]

Maybe rename to socketpair_af_inet_disallowed, to avoid the clash?

[Sam Clegg, 2015/05/27 22:30:20]

Done.

-                 DEATH_SEGV_MESSAGE(sandbox::GetErrorMessageContentForTests()),
-                 nacl::nonsfi::NaClNonSfiBPFSandboxPolicy) {
-  int fds[2];
-  socketpair(AF_INET, SOCK_STREAM, 0, fds);
-}
-#endif
-
 BPF_TEST_C(NaClNonSfiSandboxTest,
            fcntl_SETFD_allowed,
            nacl::nonsfi::NaClNonSfiBPFSandboxPolicy) {