Revert of Refactor Vaapi video decoder/encoder in preparation of Freon support

media/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
@@ skipping 558 matching lines @@
       "filters/audio_decoder_unittest.cc",
       "filters/audio_file_reader_unittest.cc",
       "filters/blocking_url_protocol_unittest.cc",
       "filters/ffmpeg_demuxer_unittest.cc",
       "filters/ffmpeg_glue_unittest.cc",
       "filters/ffmpeg_video_decoder_unittest.cc",
       "filters/in_memory_url_protocol_unittest.cc",
     ]
   }
 
-  if (cpu_arch != "arm" && is_chromeos) {
+  if (cpu_arch != "arm" && is_chromeos && use_x11) {
     sources += [ "filters/h264_bitstream_buffer_unittest.cc" ]
   }
 
   if (proprietary_codecs) {
     sources += [
       "filters/ffmpeg_aac_bitstream_converter_unittest.cc",
       "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc",
       "filters/h264_to_annex_b_bitstream_converter_unittest.cc",
       "formats/common/stream_parser_test_base.cc",
       "formats/common/stream_parser_test_base.h",
@@ skipping 158 matching lines @@
     deps = [
       ":media",
       ":shared_memory_support",
       "//base",
       "//ui/gl",
       "//ui/gfx",
       "//ui/gfx/geometry",
     ]
   }
 }