| Index: sandbox/linux/seccomp-bpf/bpf_tests.h
|
| diff --git a/sandbox/linux/seccomp-bpf/bpf_tests.h b/sandbox/linux/seccomp-bpf/bpf_tests.h
|
| index 8da25f99a5f8b9f0617b51d9f7043d803465b02d..1a0645109bf4ed0f76a80b6722b57c83487e897c 100644
|
| --- a/sandbox/linux/seccomp-bpf/bpf_tests.h
|
| +++ b/sandbox/linux/seccomp-bpf/bpf_tests.h
|
| @@ -64,24 +64,24 @@ class BpfTests : public UnitTests {
|
| static void TestWrapper(void *void_arg) {
|
| TestArgs *arg = reinterpret_cast<TestArgs *>(void_arg);
|
| playground2::Die::EnableSimpleExit();
|
| - if (playground2::Sandbox::supportsSeccompSandbox(-1) ==
|
| + if (playground2::Sandbox::SupportsSeccompSandbox(-1) ==
|
| playground2::Sandbox::STATUS_AVAILABLE) {
|
| // Ensure the the sandbox is actually available at this time
|
| int proc_fd;
|
| BPF_ASSERT((proc_fd = open("/proc", O_RDONLY|O_DIRECTORY)) >= 0);
|
| - BPF_ASSERT(playground2::Sandbox::supportsSeccompSandbox(proc_fd) ==
|
| + BPF_ASSERT(playground2::Sandbox::SupportsSeccompSandbox(proc_fd) ==
|
| playground2::Sandbox::STATUS_AVAILABLE);
|
|
|
| // Initialize and then start the sandbox with our custom policy
|
| - playground2::Sandbox::setProcFd(proc_fd);
|
| - playground2::Sandbox::setSandboxPolicy(arg->policy(), &arg->aux_);
|
| - playground2::Sandbox::startSandbox();
|
| + playground2::Sandbox::SetProcFd(proc_fd);
|
| + playground2::Sandbox::SetSandboxPolicy(arg->policy(), &arg->aux_);
|
| + playground2::Sandbox::StartSandbox();
|
|
|
| arg->test()(arg->aux_);
|
| } else {
|
| // TODO(markus): (crbug.com/141545) Call the compiler and verify the
|
| // policy. That's the least we can do, if we don't have kernel support.
|
| - playground2::Sandbox::setSandboxPolicy(arg->policy(), NULL);
|
| + playground2::Sandbox::SetSandboxPolicy(arg->policy(), NULL);
|
| }
|
| }
|
|
|
|
|