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

content/common/BUILD.gn

Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 80e6c774512876edae990b16fc9917b02221fedc..712cd6fb4e820215620bf08bd7f5528460e5020d 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -317,6 +317,13 @@ source_set("common") {
   }
 
   if (is_chromeos) {
+    sources += [
+      "gpu/media/accelerated_video_decoder.h",
+      "gpu/media/h264_decoder.cc",
+      "gpu/media/h264_decoder.h",
+      "gpu/media/h264_dpb.cc",
+      "gpu/media/h264_dpb.h",
+    ]
     if (use_v4lplugin) {
       defines += [ "USE_LIBV4L2" ]
       sources += get_target_outputs(":libv4l2_generate_stubs")
@@ -325,13 +332,8 @@ source_set("common") {
     if (use_v4l2_codec) {
       defines += [ "USE_V4L2_CODEC" ]
       sources += [
-        "gpu/media/accelerated_video_decoder.h",
         "gpu/media/generic_v4l2_device.cc",
         "gpu/media/generic_v4l2_device.h",
-        "gpu/media/h264_decoder.cc",
-        "gpu/media/h264_decoder.h",
-        "gpu/media/h264_dpb.cc",
-        "gpu/media/h264_dpb.h",
         "gpu/media/v4l2_device.cc",
         "gpu/media/v4l2_device.h",
         "gpu/media/v4l2_image_processor.cc",
@@ -361,10 +363,6 @@ source_set("common") {
     if (current_cpu != "arm") {
       sources += [
                    "gpu/media/va_surface.h",
-                   "gpu/media/vaapi_h264_decoder.cc",
-                   "gpu/media/vaapi_h264_decoder.h",
-                   "gpu/media/vaapi_h264_dpb.cc",
-                   "gpu/media/vaapi_h264_dpb.h",
                    "gpu/media/vaapi_picture.cc",
                    "gpu/media/vaapi_picture.h",
                    "gpu/media/vaapi_video_decode_accelerator.cc",