Convert a bunch of BPF_TEST tests to use BPF_TEST_C

sandbox/linux/seccomp-bpf/bpf_tests.h

 // Copyright (c) 2012 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.
 
 #ifndef SANDBOX_LINUX_SECCOMP_BPF_BPF_TESTS_H__
 #define SANDBOX_LINUX_SECCOMP_BPF_BPF_TESTS_H__
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
 #include "sandbox/linux/seccomp-bpf/bpf_tester_compatibility_delegate.h"
@@ skipping 58 matching lines @@
 // The |policy| parameter should be a SyscallEvaluator function pointer
 // (which is now a deprecated way of expressing policies).
 // BPF_TEST() takes a C++ data type as an optional fourth parameter. If
 // present, this sets up a variable that can be accessed as "BPF_AUX". This
 // variable will be passed as an argument to the "policy" function. Policies
 // would typically use it as an argument to SandboxBPF::Trap(), if they want to
 // communicate data between the BPF_TEST() and a Trap() function. The life-time
 // of this object is the same as the life-time of the process running under the
 // seccomp-bpf policy.
 // The type specified in |aux| and the last parameter of the policy function
-// must be compatible. If |aux| is not specified, the policy function must
-// take a void* as its last parameter (that is, must have the EvaluateSyscall
-// type).
-#define BPF_TEST(test_case_name, test_name, policy, aux...)               \
+// must be compatible. |aux| must not be void.
+#define BPF_TEST(test_case_name, test_name, policy, aux) \
   BPF_DEATH_TEST(test_case_name, test_name, DEATH_SUCCESS(), policy, aux)
 
 // A BPF_DEATH_TEST is just the same as a BPF_TEST, but it assumes that the
 // test will fail with a particular known error condition. Use the DEATH_XXX()
 // macros from unit_tests.h to specify the expected error condition.
-#define BPF_DEATH_TEST(test_case_name, test_name, death, policy, aux...)       \
+#define BPF_DEATH_TEST(test_case_name, test_name, death, policy, aux)          \
   void BPF_TEST_##test_name(                                                   \
       sandbox::BPFTesterCompatibilityDelegate<aux>::AuxType* BPF_AUX);         \
   TEST(test_case_name, DISABLE_ON_TSAN(test_name)) {                           \
     sandbox::SandboxBPFTestRunner bpf_test_runner(                             \
         new sandbox::BPFTesterCompatibilityDelegate<aux>(BPF_TEST_##test_name, \
                                                          policy));             \
     sandbox::UnitTests::RunTestInProcess(&bpf_test_runner, death);             \
   }                                                                            \
   void BPF_TEST_##test_name(                                                   \
       sandbox::BPFTesterCompatibilityDelegate<aux>::AuxType* BPF_AUX)
@@ skipping 18 matching lines @@
   }
 
  private:
   void (*test_function_)(void);
   DISALLOW_COPY_AND_ASSIGN(BPFTesterSimpleDelegate);
 };
 
 }  // namespace sandbox
 
 #endif  // SANDBOX_LINUX_SECCOMP_BPF_BPF_TESTS_H__