Revert 149692 - Create a LinuxSandbox class.

content/common/sandbox_init_linux.cc

 // 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.
 
 #include "content/common/seccomp_sandbox.h"
 #include "content/public/common/sandbox_init.h"
 
 #if defined(__i386__) || defined(__x86_64__)
 
 // This is an assert for GYP
@@ skipping 14 matching lines @@
 #include <sys/types.h>
 #include <ucontext.h>
 #include <unistd.h>
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/time.h"
-#include "content/common/sandbox_linux.h"
 #include "content/public/common/content_switches.h"
 #include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
 
 // These are fairly new and not defined in all headers yet.
 #if defined(__x86_64__)
 
 #ifndef __NR_process_vm_readv
   #define __NR_process_vm_readv 310
 #endif
 
@@ skipping 486 matching lines @@
 
   // Warms up resources needed by the policy we're about to enable.
   WarmupPolicy(SyscallPolicy);
 
   playground2::Sandbox::setSandboxPolicy(SyscallPolicy, NULL);
   playground2::Sandbox::startSandbox();
 
   return true;
 }
 
+bool InitializeLegacySandbox_x86(const CommandLine& command_line,
+                                  const std::string& process_type) {
+#if defined(SECCOMP_SANDBOX)
+  // Start the old seccomp mode 1 (sandbox/linux/seccomp-legacy).
+  if (process_type == switches::kRendererProcess && SeccompSandboxEnabled()) {
+    // N.b. SupportsSeccompSandbox() returns a cached result, as we already
+    // called it earlier in the zygote. Thus, it is OK for us to not pass in
+    // a file descriptor for "/proc".
+    if (SupportsSeccompSandbox(-1)) {
+      StartSeccompSandbox();
+      return true;
+    }
+  }
+#endif
+  return false;
+}
+
 }  // anonymous namespace
 
 #endif  // defined(__i386__) || defined(__x86_64__)
 
 namespace content {
 
 void InitializeSandbox() {
 #if defined(__i386__) || defined(__x86_64__)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   const std::string process_type =
       command_line.GetSwitchValueASCII(switches::kProcessType);
   bool seccomp_legacy_started = false;
   bool seccomp_bpf_started = false;
 
   // First, try to enable seccomp-legacy.
   seccomp_legacy_started =
-      LinuxSandbox::GetInstance()->StartSeccompLegacy(process_type);
+      InitializeLegacySandbox_x86(command_line, process_type);
   if (seccomp_legacy_started)
     LogSandboxStarted("seccomp-legacy", process_type);
 
   // Then, try to enable seccomp-bpf.
   // If seccomp-legacy is enabled, seccomp-bpf initialization will crash
   // instead of failing gracefully.
   // TODO(markus): fix this (crbug.com/139872).
   if (!seccomp_legacy_started) {
     seccomp_bpf_started =
         InitializeBpfSandbox_x86(command_line, process_type);
   }
   if (seccomp_bpf_started)
     LogSandboxStarted("seccomp-bpf", process_type);
 #endif
 }
 
 }  // namespace content