Merged VideoSurface, VideoFrame and VideoFrameImpl in VideoFrame.

media/media.gyp

 # Copyright (c) 2010 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,
     'player_x11_renderer%': 'x11',
   },
   'targets': [
@@ skipping 54 matching lines @@
         'base/media_switches.h',
         'base/media_win.cc',
         'base/pipeline.h',
         'base/pipeline_impl.cc',
         'base/pipeline_impl.h',
         'base/pts_heap.h',
         'base/seekable_buffer.cc',
         'base/seekable_buffer.h',
         'base/synchronizer.cc',
         'base/synchronizer.h',
-        'base/video_frame_impl.cc',
-        'base/video_frame_impl.h',
+        'base/video_frame.cc',
+        'base/video_frame.h',
         'base/yuv_convert.cc',
         'base/yuv_convert.h',
         'base/yuv_row_win.cc',
         'base/yuv_row_mac.cc',
         'base/yuv_row_linux.cc',
         'base/yuv_row.h',
         'ffmpeg/ffmpeg_common.cc',
         'ffmpeg/ffmpeg_common.h',
         'ffmpeg/ffmpeg_util.cc',
         'ffmpeg/ffmpeg_util.h',
@@ skipping 91 matching lines @@
         'base/mock_ffmpeg.h',
         'base/mock_filter_host.h',
         'base/mock_filters.cc',
         'base/mock_filters.h',
         'base/mock_reader.h',
         'base/mock_task.h',
         'base/pipeline_impl_unittest.cc',
         'base/pts_heap_unittest.cc',
         'base/run_all_unittests.cc',
         'base/seekable_buffer_unittest.cc',
-        'base/video_frame_impl_unittest.cc',
+        'base/video_frame_unittest.cc',
         'base/yuv_convert_unittest.cc',
         'filters/audio_renderer_algorithm_ola_unittest.cc',
         'filters/audio_renderer_base_unittest.cc',
         'filters/bitstream_converter_unittest.cc',
         'filters/decoder_base_unittest.cc',
         'filters/ffmpeg_demuxer_unittest.cc',
         'filters/ffmpeg_glue_unittest.cc',
         'filters/ffmpeg_video_decode_engine_unittest.cc',
         'filters/file_data_source_unittest.cc',
         'filters/video_decoder_impl_unittest.cc',
@@ skipping 223 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: