Merge VideoDecodeAcceleratorImpl with VideoDecodeAccelerator

content/content_common.gypi

 # 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../components/tracing.gyp:tracing',
     '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
     '../net/net.gyp:net',
@@ skipping 266 matching lines @@
       'common/gpu/image_transport_surface.cc',
       'common/gpu/image_transport_surface.h',
       'common/gpu/image_transport_surface_android.cc',
       'common/gpu/image_transport_surface_linux.cc',
       'common/gpu/image_transport_surface_mac.cc',
       'common/gpu/image_transport_surface_win.cc',
       'common/gpu/media/gpu_video_decode_accelerator.cc',
       'common/gpu/media/gpu_video_decode_accelerator.h',
       'common/gpu/media/gpu_video_encode_accelerator.cc',
       'common/gpu/media/gpu_video_encode_accelerator.h',
-      'common/gpu/media/video_decode_accelerator_impl.cc',
-      'common/gpu/media/video_decode_accelerator_impl.h',
       'common/gpu/stream_texture_android.cc',
       'common/gpu/stream_texture_android.h',
       'common/gpu/sync_point_manager.cc',
       'common/gpu/sync_point_manager.h',
       'common/gpu/texture_image_transport_surface.cc',
       'common/gpu/texture_image_transport_surface.h',
       'common/handle_enumerator_win.cc',
       'common/handle_enumerator_win.h',
       'common/host_shared_bitmap_manager.cc',
       'common/host_shared_bitmap_manager.h',
@@ skipping 495 matching lines @@
         'common/sandbox_linux/bpf_renderer_policy_linux.cc',
         'common/sandbox_linux/bpf_renderer_policy_linux.h',
         'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
         'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
       ],
     }, {
       'defines': ['USE_SECCOMP_BPF'],
     }],
   ],
 }