Remove additional protection of kDisableAcceleratedVideoDecode in bpf_gpu_policy_linux.cc.

content/content_tests.gypi

 # Copyright (c) 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'dependencies': [
@@ skipping 1245 matching lines @@
           'include_dirs': [
             '..',
           ],
           'sources': [
             'test/webkit_unit_test_support.cc',
             'test/webkit_unit_test_support.h',
           ],
         },
       ],
     }],
-    ['chromeos==1 or OS=="win" or OS=="android"', {
+    ['(chromeos==1 or (OS=="linux" and use_x11==1 and target_arch != "arm")) or OS=="win" or OS=="android"', {
       'targets': [
           {
             'target_name': 'video_decode_accelerator_unittest',
             'type': '<(gtest_target_type)',
             'dependencies': [
               'content.gyp:content',
+              'test_support_content',
               '../base/base.gyp:base',
               '../testing/gtest.gyp:gtest',
               '../media/media.gyp:media',
               '../ui/gl/gl.gyp:gl',
               '../ui/gfx/gfx.gyp:gfx',
               '../ui/gfx/gfx.gyp:gfx_geometry',
               '../ui/ui.gyp:ui',
             ],
             'include_dirs': [
               '<(DEPTH)/third_party/khronos',
@@ skipping 45 matching lines @@
                 'dependencies': [
                   '../build/linux/system.gyp:x11',  # Used by rendering_helper.cc
                 ],
               }],
             ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [ 4267, ],
           },
         ]
     }],
-    ['chromeos==1 and use_x11 == 1 and target_arch != "arm"', {
+    ['(chromeos==1 or OS=="linux") and use_x11==1 and target_arch != "arm"', {
       'targets': [
           {
             'target_name': 'vaapi_h264_decoder_unittest',
             'type': '<(gtest_target_type)',
             'dependencies': [
               'content.gyp:content_common',
+              'test_support_content',
               '../base/base.gyp:base',
               '../media/media.gyp:media',
               '../testing/gtest.gyp:gtest',
               '../third_party/libyuv/libyuv.gyp:libyuv',
               '../ui/gfx/gfx.gyp:gfx_geometry',
             ],
             'sources': [
               'common/gpu/media/vaapi_h264_decoder_unittest.cc',
             ],
             'include_dirs': [
@@ skipping 349 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }