Revert 279958 "Revert "Revert 279650 "Add VaapiVideoEncodeAccele..."

trunk/src/content/common/sandbox_linux/bpf_gpu_policy_linux.cc

Index: trunk/src/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
===================================================================
--- trunk/src/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	(revision 280019)
+++ trunk/src/content/common/sandbox_linux/bpf_gpu_policy_linux.cc	(working copy)
@@ -72,15 +72,9 @@
 #endif
 }
 
-bool IsAcceleratedVideoEnabled() {
+bool IsAcceleratedVideoDecodeEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  bool accelerated_encode_enabled = false;
-#if defined(OS_CHROMEOS)
-  accelerated_encode_enabled =
-      command_line.HasSwitch(switches::kEnableVaapiAcceleratedVideoEncode);
-#endif
-  return !command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode) ||
-         accelerated_encode_enabled;
+  return !command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode);
 }
 
 intptr_t GpuSIGSYS_Handler(const struct arch_seccomp_data& args,
@@ -220,9 +214,9 @@
       std::vector<std::string>());
 
   if (IsArchitectureX86_64() || IsArchitectureI386()) {
-    // Accelerated video dlopen()'s some shared objects
+    // Accelerated video decode dlopen()'s some shared objects
     // inside the sandbox, so preload them now.
-    if (IsAcceleratedVideoEnabled()) {
+    if (IsAcceleratedVideoDecodeEnabled()) {
       const char* I965DrvVideoPath = NULL;
 
       if (IsArchitectureX86_64()) {