Test X11 header pollution

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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 1556 matching lines @@
         },
         {
           'target_name': 'telemetry_base',
           'type': 'none',
           'dependencies': [
             '../third_party/catapult/telemetry/telemetry.gyp:bitmaptools#host',
           ],
         },
       ],
     }],
-    ['chromeos==1 or OS=="win" or OS=="android"', {
-      'targets': [
-          {
-            # TODO(GYP): Port Windows and ChromeOS logic.
-            # GN: //content/test:video_decode_accelerator_unittest
-            'target_name': 'video_decode_accelerator_unittest',
-            'type': '<(gtest_target_type)',
-            'dependencies': [
-              '../base/base.gyp:base',
-              '../gpu/gpu.gyp:command_buffer_service',
-              '../media/media.gyp:media',
-              '../testing/gtest.gyp:gtest',
-              '../ui/base/ui_base.gyp:ui_base',
-              '../ui/gfx/gfx.gyp:gfx',
-              '../ui/gfx/gfx.gyp:gfx_geometry',
-              '../ui/gfx/gfx.gyp:gfx_test_support',
-              '../ui/gl/gl.gyp:gl',
-              '../ui/gl/gl.gyp:gl_test_support',
-              'content.gyp:content',
-            ],
-            'include_dirs': [
-              '<(DEPTH)/third_party/khronos',
-            ],
-            'sources': [
-              'common/gpu/media/android_video_decode_accelerator_unittest.cc',
-              'common/gpu/media/rendering_helper.cc',
-              'common/gpu/media/rendering_helper.h',
-              'common/gpu/media/video_accelerator_unittest_helpers.h',
-              'common/gpu/media/video_decode_accelerator_unittest.cc',
-            ],
-            'conditions': [
-              ['OS=="android"', {
-                'sources/': [
-                  ['exclude', '^common/gpu/media/rendering_helper.h'],
-                  ['exclude', '^common/gpu/media/rendering_helper.cc'],
-                  ['exclude', '^common/gpu/media/video_decode_accelerator_unittest.cc'],
-                ],
-                'dependencies': [
-                  '../media/media.gyp:player_android',
-                  '../testing/gmock.gyp:gmock',
-                  '../testing/android/native_test.gyp:native_test_native_code',
-                  '../gpu/gpu.gyp:gpu_unittest_utils',
-                ],
-              }, {  # OS!="android"
-                'sources/': [
-                  ['exclude', '^common/gpu/media/android_video_decode_accelerator_unittest.cc'],
-                ],
-              }],
-              ['OS=="win"', {
-                'dependencies': [
-                  '<(angle_path)/src/angle.gyp:libEGL',
-                  '<(angle_path)/src/angle.gyp:libGLESv2',
-                ],
-              }],
-              ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
-                'include_dirs': [
-                  '<(DEPTH)/third_party/libva',
-                ],
-              }],
-              ['use_x11==1', {
-                'dependencies': [
-                  '../build/linux/system.gyp:x11',  # Used by rendering_helper.cc
-                  '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
-                ],
-              }],
-              ['use_ozone==1 and chromeos==1', {
-                'dependencies': [
-                  '../ui/display/display.gyp:display',  # Used by rendering_helper.cc
-                  '../ui/ozone/ozone.gyp:ozone',  # Used by rendering_helper.cc
-                ],
-              }],
-            ],
-            # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-            'msvs_disabled_warnings': [ 4267, ],
-          },
-        ]
-    }],
-    ['chromeos==1 and target_arch != "arm"', {
-      'targets': [
-          {
-            'target_name': 'vaapi_jpeg_decoder_unittest',
-            'type': '<(gtest_target_type)',
-            'dependencies': [
-              'content.gyp:content_common',
-              '../base/base.gyp:base',
-              '../media/media.gyp:media',
-              '../media/media.gyp:media_test_support',
-              '../testing/gtest.gyp:gtest',
-            ],
-            'sources': [
-              'common/gpu/media/vaapi_jpeg_decoder_unittest.cc',
-            ],
-            'include_dirs': [
-              '<(DEPTH)/third_party/libva',
-            ],
-            'conditions': [
-              ['use_x11==1', {
-                'dependencies': [
-                  '../build/linux/system.gyp:x11',
-                ]
-              }, {
-                'dependencies': [
-                  '../build/linux/system.gyp:libdrm',
-                ]
-              }],
-            ],
-          }
-        ]
-    }],
-    ['chromeos==1 or OS=="mac"', {
-      'targets': [
-        {
-          'target_name': 'video_encode_accelerator_unittest',
-          'type': 'executable',
-          'dependencies': [
-            'content.gyp:content_common',
-            '../base/base.gyp:base',
-            '../media/media.gyp:media',
-            '../media/media.gyp:media_test_support',
-            '../testing/gtest.gyp:gtest',
-            '../ui/base/ui_base.gyp:ui_base',
-            '../ui/gfx/gfx.gyp:gfx',
-            '../ui/gfx/gfx.gyp:gfx_geometry',
-            '../ui/gfx/gfx.gyp:gfx_test_support',
-            '../ui/gl/gl.gyp:gl',
-            '../ui/gl/gl.gyp:gl_test_support',
-            'content.gyp:content',
-          ],
-          'sources': [
-            'common/gpu/media/video_accelerator_unittest_helpers.h',
-            'common/gpu/media/video_encode_accelerator_unittest.cc',
-          ],
-          'include_dirs': [
-            '<(DEPTH)/third_party/libva',
-            '<(DEPTH)/third_party/libyuv',
-          ],
-          'conditions': [
-            ['use_x11==1', {
-              'dependencies': [
-                '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
-              ],
-            }],
-            ['use_ozone==1', {
-              'dependencies': [
-                '../ui/ozone/ozone.gyp:ozone',
-              ],
-            }],
-          ],
-        }
-      ]
-    }],
-    ['chromeos==1', {
-      'targets': [
-        {
-          'target_name': 'jpeg_decode_accelerator_unittest',
-          'type': 'executable',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../media/media.gyp:media',
-            '../media/media.gyp:media_test_support',
-            '../testing/gtest.gyp:gtest',
-            '../third_party/libyuv/libyuv.gyp:libyuv',
-            '../ui/gfx/gfx.gyp:gfx',
-            '../ui/gfx/gfx.gyp:gfx_geometry',
-            '../ui/gl/gl.gyp:gl',
-            '../ui/gl/gl.gyp:gl_test_support',
-            'content.gyp:content',
-          ],
-          'sources': [
-            'common/gpu/media/jpeg_decode_accelerator_unittest.cc',
-          ],
-          'include_dirs': [
-            '<(DEPTH)/third_party/libva',
-            '<(DEPTH)/third_party/libyuv',
-          ],
-        }
-      ]
-    }],
     ['OS == "android"', {
       'targets': [
         {
           # GN: //content/test:content_unittests
           'target_name': 'content_unittests_apk',
           'type': 'none',
           'dependencies': [
             'content.gyp:content_java',
             'content_unittests',
           ],
@@ skipping 190 matching lines @@
           'type': 'none',
           'sources': [
             'shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java',
           ],
           'variables': {
             'jni_gen_package': 'content/shell',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
-          # GN: //content/test:video_decode_accelerator_unittest_apk
-          'target_name': 'video_decode_accelerator_unittest_apk',
-          'type': 'none',
-          'dependencies': [
-            'video_decode_accelerator_unittest',
-          ],
-          'variables': {
-            'test_suite_name': 'video_decode_accelerator_unittest',
-          },
-          'includes': [ '../build/apk_test.gypi' ],
-        },
-        {
           # GN: //content/public/test/android:test_support_content_jni_headers
           'target_name': 'test_support_content_jni_headers',
           'type': 'none',
           'sources': [
             'public/test/android/javatests/src/org/chromium/content/browser/test/NestedSystemMessageHandler.java',
           ],
           'variables': {
             'jni_gen_package': 'content/public/test',
           },
           'includes': [ '../build/jni_generator.gypi' ],
@@ skipping 115 matching lines @@
                   'content_unittests_apk.isolate',
                 ],
               },
             ],
           },
         ],
       ],
     }],
   ],
 }