Refactor Vaapi video decoder/encoder in preparation of Freon support

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index cb3c05ec586b15720b90515d864e7ec6aff43176..eec3aad4576733d1a922e3f7a449f85d3a805651 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1609,7 +1609,6 @@
             'dependencies': [
               'content.gyp:content_common',
               '../base/base.gyp:base',
-              '../build/linux/system.gyp:x11',
               '../media/media.gyp:media',
               '../testing/gtest.gyp:gtest',
               '../third_party/libyuv/libyuv.gyp:libyuv',
@@ -1621,6 +1620,13 @@
             'include_dirs': [
               '<(DEPTH)/third_party/libva',
             ],
+            'conditions': [
+              ['use_x11==1', {

[piman, 2014/12/17 18:57:06]

This condition is already true in this block. Did you mean to remove it from
l.1604?

[llandwerlin-old, 2014/12/17 21:24:59]

Thanks, removing this.

+                'dependencies': [
+                  '../build/linux/system.gyp:x11',
+                ]
+              }],
+            ],
           },
         ]
     }],