VAVDA: Use the new, generic video decoder and accelerator infrastructure.

content/content_common.gypi

Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index d0a5c9f17153d045535d4cc7b8e073dad6b26873..70153aaffd22b0a88ffedb8f50a74023b6820e0b 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -820,6 +820,15 @@
         },
       ],
     }],
+    ['chromeos==1', {
+      'sources': [
+        'common/gpu/media/accelerated_video_decoder.h',
+        'common/gpu/media/h264_decoder.cc',
+        'common/gpu/media/h264_decoder.h',
+        'common/gpu/media/h264_dpb.cc',
+        'common/gpu/media/h264_dpb.h',
+      ],
+    }],
     ['chromeos==1 and use_v4l2_codec==1', {
       'direct_dependent_settings': {
         'defines': [
@@ -833,13 +842,8 @@
         '../media/media.gyp:media',
       ],
       'sources': [
-        'common/gpu/media/accelerated_video_decoder.h',
         'common/gpu/media/generic_v4l2_device.cc',
         'common/gpu/media/generic_v4l2_device.h',
-        'common/gpu/media/h264_decoder.cc',
-        'common/gpu/media/h264_decoder.h',
-        'common/gpu/media/h264_dpb.cc',
-        'common/gpu/media/h264_dpb.h',
         'common/gpu/media/v4l2_device.cc',
         'common/gpu/media/v4l2_device.h',
         'common/gpu/media/v4l2_image_processor.cc',
@@ -872,10 +876,6 @@
       ],
       'sources': [
         'common/gpu/media/va_surface.h',
-        'common/gpu/media/vaapi_h264_decoder.cc',
-        'common/gpu/media/vaapi_h264_decoder.h',
-        'common/gpu/media/vaapi_h264_dpb.cc',
-        'common/gpu/media/vaapi_h264_dpb.h',
         'common/gpu/media/vaapi_jpeg_decoder.cc',
         'common/gpu/media/vaapi_jpeg_decoder.h',
         'common/gpu/media/vaapi_picture.cc',