Reland: Refactor Vaapi video decoder/encoder in preparation of Freon support

media/media.gyp

 # Copyright (c) 2012 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': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 679 matching lines @@
               'dependencies': [
                 'media_java',
               ],
             }],
           ],
           'defines': [
             'DISABLE_USER_INPUT_MONITOR',
           ],
         }],
         # For VaapiVideoEncodeAccelerator.
-        ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
+        ['target_arch != "arm" and chromeos == 1', {
           'sources': [
             'filters/h264_bitstream_buffer.cc',
             'filters/h264_bitstream_buffer.h',
           ],
         }],
         ['use_alsa==1', {
           'link_settings': {
             'libraries': [
               '-lasound',
             ],
@@ skipping 1177 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'media_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }