Android media: VideoFrame should not store so many sync points.

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index f662451e3dcc5ac00559016f739bee3941cd4ae2..c323f36902bfbbf900558dcd8905ac53aa880c65 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1362,12 +1362,13 @@
         },
       ],
     }],
-    ['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"', {

[danakj, 2014/06/19 15:56:26]

and this?

       'targets': [
           {
             'target_name': 'video_decode_accelerator_unittest',
             'type': '<(gtest_target_type)',
             'dependencies': [
+              'test_support_content',
               '../base/base.gyp:base',
               '../media/media.gyp:media',
               '../testing/gtest.gyp:gtest',
@@ -1435,13 +1436,14 @@
           },
         ]
     }],
-    ['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',
               '../build/linux/system.gyp:x11',
               '../media/media.gyp:media',