Merge 279733 "Revert 279650 "Add VaapiVideoEncodeAccelerator for..."

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': 'layouttest_support_content',
       'type': 'static_library',
       'conditions': [
@@ skipping 1448 matching lines @@
             ],
             'sources': [
               'common/gpu/media/vaapi_h264_decoder_unittest.cc',
             ],
             'include_dirs': [
               '<(DEPTH)/third_party/libva',
             ],
           },
         ]
     }],
-    ['chromeos==1 and (target_arch == "arm" or use_x11 == 1)', {
+    ['chromeos==1 and target_arch == "arm"', {
       'targets': [
         {
           'target_name': 'video_encode_accelerator_unittest',
           'type': 'executable',
           'dependencies': [
             '../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/gl/gl.gyp:gl',
             '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',
-              ],
-            }],
-          ],
         },
       ]
     }],
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'content_gl_tests_apk',
           'type': 'none',
           'dependencies': [
             'content_gl_tests',
@@ skipping 322 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }