Linux sandbox: cleanup sandbox-bpf naming.

components/nacl/loader/nacl_sandbox_linux.cc

 // Copyright 2013 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.
 
 #include "components/nacl/loader/nacl_sandbox_linux.h"
 
 #include <errno.h>
 #include <signal.h>
 #include <sys/ptrace.h>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "content/public/common/sandbox_init.h"
 #include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
 #include "sandbox/linux/seccomp-bpf/sandbox_bpf_policy.h"
 #include "sandbox/linux/services/linux_syscalls.h"
 
-using playground2::ErrorCode;
-using playground2::Sandbox;
-using playground2::SandboxBpfPolicy;
+using sandbox::ErrorCode;
+using sandbox::SandboxBPF;
+using sandbox::SandboxBPFPolicy;
 
 namespace {
 
 // On ARM and x86_64, System V shared memory calls have each their own system
 // call, while on i386 they are multiplexed.
 #if defined(__x86_64__) || defined(__arm__)
 bool IsSystemVSharedMemory(int sysno) {
   switch (sysno) {
     case __NR_shmat:
     case __NR_shmctl:
@@ skipping 11 matching lines @@
 bool IsSystemVIpc(int sysno) {
   switch (sysno) {
     case __NR_ipc:
       return true;
     default:
       return false;
   }
 }
 #endif
 
-class NaClBpfSandboxPolicy : public SandboxBpfPolicy {
+class NaClBPFSandboxPolicy : public SandboxBPFPolicy {
  public:
-  NaClBpfSandboxPolicy()
-      : baseline_policy_(content::GetBpfSandboxBaselinePolicy()) {}
-  virtual ~NaClBpfSandboxPolicy() {}
+  NaClBPFSandboxPolicy()
+      : baseline_policy_(content::GetBPFSandboxBaselinePolicy()) {}
+  virtual ~NaClBPFSandboxPolicy() {}
 
-  virtual ErrorCode EvaluateSyscall(Sandbox* sandbox_compiler,
+  virtual ErrorCode EvaluateSyscall(SandboxBPF* sandbox_compiler,
                                     int system_call_number) const OVERRIDE;
 
  private:
-  scoped_ptr<SandboxBpfPolicy> baseline_policy_;
-  DISALLOW_COPY_AND_ASSIGN(NaClBpfSandboxPolicy);
+  scoped_ptr<SandboxBPFPolicy> baseline_policy_;
+  DISALLOW_COPY_AND_ASSIGN(NaClBPFSandboxPolicy);
 };
 
-ErrorCode NaClBpfSandboxPolicy::EvaluateSyscall(
-    playground2::Sandbox* sb, int sysno) const {
+ErrorCode NaClBPFSandboxPolicy::EvaluateSyscall(
+    sandbox::SandboxBPF* sb, int sysno) const {
   DCHECK(baseline_policy_);
   switch (sysno) {
     // TODO(jln): NaCl's GDB debug stub uses the following socket system calls,
     // see if it can be restricted a bit.
 #if defined(__x86_64__) || defined(__arm__)
     // transport_common.cc needs this.
     case __NR_accept:
     case __NR_setsockopt:
 #elif defined(__i386__)
     case __NR_socketcall:
@@ skipping 63 matching lines @@
   errno = 0;
   // Make a ptrace request with an invalid PID.
   long ptrace_ret = ptrace(PTRACE_PEEKUSER, -1 /* pid */, NULL, NULL);
   CHECK_EQ(-1, ptrace_ret);
   // Without the sandbox on, this ptrace call would ESRCH instead.
   CHECK_EQ(EPERM, errno);
 }
 
 }  // namespace
 
-bool InitializeBpfSandbox() {
+bool InitializeBPFSandbox() {
   bool sandbox_is_initialized = content::InitializeSandbox(
-      scoped_ptr<SandboxBpfPolicy>(new NaClBpfSandboxPolicy()));
+      scoped_ptr<SandboxBPFPolicy>(new NaClBPFSandboxPolicy()));
   if (sandbox_is_initialized) {
     RunSandboxSanityChecks();
     return true;
   }
   return false;
 }