Collapse FFmpegVideoDecodeEngine into FFmpegVideoDecoder and remove VideoDecodeEngine.

media/media.gyp

 # Copyright (c) 2011 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 PulseAudio library.
     'use_pulseaudio%': 0,
   },
@@ skipping 223 matching lines @@
         'video/capture/win/filter_base_win.h',
         'video/capture/win/pin_base_win.cc',
         'video/capture/win/pin_base_win.h',
         'video/capture/win/sink_filter_observer_win.h',
         'video/capture/win/sink_filter_win.cc',
         'video/capture/win/sink_filter_win.h',
         'video/capture/win/sink_input_pin_win.cc',
         'video/capture/win/sink_input_pin_win.h',
         'video/capture/win/video_capture_device_win.cc',
         'video/capture/win/video_capture_device_win.h',
-        'video/ffmpeg_video_decode_engine.cc',
-        'video/ffmpeg_video_decode_engine.h',
         'video/picture.cc',
         'video/picture.h',
         'video/video_decode_accelerator.cc',
         'video/video_decode_accelerator.h',
-        'video/video_decode_engine.h',
         'webm/webm_constants.h',
         'webm/webm_cluster_parser.cc',
         'webm/webm_cluster_parser.h',
         'webm/webm_info_parser.cc',
         'webm/webm_info_parser.h',
         'webm/webm_parser.cc',
         'webm/webm_parser.h',
         'webm/webm_tracks_parser.cc',
         'webm/webm_tracks_parser.h',
       ],
@@ skipping 31 matching lines @@
             'filters/ffmpeg_demuxer.cc',
             'filters/ffmpeg_demuxer.h',
             'filters/ffmpeg_demuxer_factory.cc',
             'filters/ffmpeg_demuxer_factory.h',
             'filters/ffmpeg_h264_bitstream_converter.cc',
             'filters/ffmpeg_h264_bitstream_converter.h',
             'filters/ffmpeg_glue.cc',
             'filters/ffmpeg_glue.h',
             'filters/ffmpeg_video_decoder.cc',
             'filters/ffmpeg_video_decoder.h',
-            'video/ffmpeg_video_decode_engine.cc',
-            'video/ffmpeg_video_decode_engine.h',
           ],
         }],
         # The below 'android' condition were added temporarily and should be
         # removed in downstream, because there is no Java environment setup in
         # upstream yet.
         ['OS == "android"', {
           'sources!':[
             'audio/android/audio_track_output_android.cc',
           ],
           'sources':[
@@ skipping 597 matching lines @@
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
           'sources': [
             'tools/media_bench/media_bench.cc',
           ],
         },
       ],
     }]
   ],
 }