Index: sandbox/linux/seccomp-bpf/verifier.cc |
diff --git a/sandbox/linux/seccomp-bpf/verifier.cc b/sandbox/linux/seccomp-bpf/verifier.cc |
index 1d6b26d59254d4858813113632dd44664fdeb581..1292504decc012e9cfbc6c3e6eca39cc440b8cf6 100644 |
--- a/sandbox/linux/seccomp-bpf/verifier.cc |
+++ b/sandbox/linux/seccomp-bpf/verifier.cc |
@@ -9,12 +9,10 @@ |
#include "sandbox/linux/seccomp-bpf/syscall_iterator.h" |
#include "sandbox/linux/seccomp-bpf/verifier.h" |
-namespace { |
-using playground2::ErrorCode; |
-using playground2::Sandbox; |
-using playground2::Verifier; |
-using playground2::arch_seccomp_data; |
+namespace sandbox { |
+ |
+namespace { |
struct State { |
State(const std::vector<struct sock_filter>& p, |
@@ -30,7 +28,7 @@ struct State { |
DISALLOW_IMPLICIT_CONSTRUCTORS(State); |
}; |
-uint32_t EvaluateErrorCode(Sandbox* sandbox, |
+uint32_t EvaluateErrorCode(SandboxBPF* sandbox, |
const ErrorCode& code, |
const struct arch_seccomp_data& data) { |
if (code.error_type() == ErrorCode::ET_SIMPLE || |
@@ -78,7 +76,7 @@ uint32_t EvaluateErrorCode(Sandbox* sandbox, |
} |
} |
-bool VerifyErrorCode(Sandbox* sandbox, |
+bool VerifyErrorCode(SandboxBPF* sandbox, |
const std::vector<struct sock_filter>& program, |
struct arch_seccomp_data* data, |
const ErrorCode& root_code, |
@@ -362,11 +360,9 @@ void Alu(State* state, const struct sock_filter& insn, const char** err) { |
} // namespace |
-namespace playground2 { |
- |
-bool Verifier::VerifyBPF(Sandbox* sandbox, |
+bool Verifier::VerifyBPF(SandboxBPF* sandbox, |
const std::vector<struct sock_filter>& program, |
- const SandboxBpfPolicy& policy, |
+ const SandboxBPFPolicy& policy, |
const char** err) { |
*err = NULL; |
for (SyscallIterator iter(false); !iter.Done();) { |
@@ -447,4 +443,4 @@ uint32_t Verifier::EvaluateBPF(const std::vector<struct sock_filter>& program, |
return 0; |
} |
-} // namespace |
+} // namespace sandbox |