| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index 993685073b1e9cd88f7b80e573e8322673830b01..15425cc5f040d98921e22c6ef3da8921189e9ed3 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -3335,36 +3335,42 @@
|
| }],
|
| ],
|
| },
|
| - {
|
| + # {
|
| # Executable that contains tests that specifically test gpu video decoding
|
| # features. Excludes for example command buffer implementation.
|
| - 'target_name': 'gpu_video_tests',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - 'test_support_common',
|
| - '../base/base.gyp:base',
|
| - '../base/base.gyp:base_i18n',
|
| - '../base/base.gyp:test_support_base',
|
| - '../ipc/ipc.gyp:test_support_ipc',
|
| - '../skia/skia.gyp:skia',
|
| - '../testing/gtest.gyp:gtest',
|
| - '../testing/gmock.gyp:gmock',
|
| - ],
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| - 'sources': [
|
| - '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.cc',
|
| - '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.h',
|
| - '<(DEPTH)/content/gpu/gpu_video_decode_accelerator_tester.cc',
|
| - '<(DEPTH)/media/video/picture.cc',
|
| - '<(DEPTH)/media/video/picture.h',
|
| - '<(DEPTH)/media/video/video_decode_accelerator.cc',
|
| - '<(DEPTH)/media/video/video_decode_accelerator.h',
|
| - '<(DEPTH)/ui/gfx/size.cc',
|
| - '<(DEPTH)/ui/gfx/size.h',
|
| - ],
|
| - },
|
| + #
|
| + # TODO(vrk): These tests are temporarily disabled as the VideoDecode PPAPI
|
| + # is getting an overhaul. Tests will be reenabled when the API has been
|
| + # stabilized and gpu_video_decode_accelerator_test.cc is updated to
|
| + # reflect the changes.
|
| + #
|
| + # 'target_name': 'gpu_video_tests',
|
| + # 'type': 'executable',
|
| + # 'dependencies': [
|
| + # 'test_support_common',
|
| + # '../base/base.gyp:base',
|
| + # '../base/base.gyp:base_i18n',
|
| + # '../base/base.gyp:test_support_base',
|
| + # '../ipc/ipc.gyp:test_support_ipc',
|
| + # '../skia/skia.gyp:skia',
|
| + # '../testing/gtest.gyp:gtest',
|
| + # '../testing/gmock.gyp:gmock',
|
| + # ],
|
| + # 'include_dirs': [
|
| + # '..',
|
| + # ],
|
| + # 'sources': [
|
| + # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.cc',
|
| + # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator.h',
|
| + # '<(DEPTH)/content/gpu/gpu_video_decode_accelerator_tester.cc',
|
| + # '<(DEPTH)/media/video/picture.cc',
|
| + # '<(DEPTH)/media/video/picture.h',
|
| + # '<(DEPTH)/media/video/video_decode_accelerator.cc',
|
| + # '<(DEPTH)/media/video/video_decode_accelerator.h',
|
| + # '<(DEPTH)/ui/gfx/size.cc',
|
| + # '<(DEPTH)/ui/gfx/size.h',
|
| + # ],
|
| + # },
|
| {
|
| 'target_name': 'plugin_tests',
|
| 'type': 'executable',
|
|
|