Remove the seccomp filter disable.

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/public/common/sandbox_init.h"
 
 #if defined(__i386__) || defined(__x86_64__)
 
 // This is an assert for GYP
 #if !defined(OS_LINUX)
   #error "Linux specific file compiled on non Linux OS!"
 #endif
 
 #include <asm/unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/audit.h>
 #include <linux/filter.h>
 #include <signal.h>
 #include <string.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <ucontext.h>
 #include <unistd.h>
 
 #include <vector>
 
 #include "base/command_line.h"
-#include "base/environment.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/time.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 354 matching lines @@
 }
 
 // Is the sandbox fully disabled for this process?
 bool ShouldDisableSandbox(const CommandLine& command_line,
                           const std::string& process_type) {
   if (command_line.HasSwitch(switches::kNoSandbox) ||
       command_line.HasSwitch(switches::kDisableSeccompFilterSandbox)) {
     return true;
   }
 
-  if (!IsChromeOS()) {
-    // On non ChromeOS we never enable the sandbox AT ALL unless
-    // CHROME_ENABLE_SECCOMP is in the environment.
-    // TODO(jorgelo): remove this when seccomp BPF is included
-    // in an upstream release Linux kernel.
-    static const char kEnableSeccomp[] = "CHROME_ENABLE_SECCOMP";
-    scoped_ptr<base::Environment> env(base::Environment::Create());
-
-    if (!env->HasVar(kEnableSeccomp))
-      return true;
-  }
-
   if (process_type == switches::kGpuProcess) {
     // The GPU sandbox is disabled by default in ChromeOS, enabled by default on
     // generic Linux.
     // TODO(jorgelo): when we feel comfortable, make this a policy decision
     // instead. (i.e. move this to GetProcessSyscallPolicy) and return an
     // AllowAllPolicy for lack of "--enable-gpu-sandbox".
     bool should_disable;
     if (IsChromeOS()) {
       should_disable = true;
     } else {
@@ skipping 110 matching lines @@
 
 namespace content {
 
 void InitializeSandbox() {
 #if defined(__i386__) || defined(__x86_64__)
   InitializeSandbox_x86();
 #endif
 }
 
 }  // namespace content