Revert of Cleanup of webrtc::VideoFrame.

webrtc/test/webrtc_test_common.gyp

 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 {
   'includes': [
     '../build/common.gypi',
@@ skipping 51 matching lines @@
         }],
       ],
       'dependencies': [
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
         '<(webrtc_root)/base/base.gyp:rtc_base',
         '<(webrtc_root)/common.gyp:webrtc_common',
         '<(webrtc_root)/modules/modules.gyp:media_file',
         '<(webrtc_root)/modules/modules.gyp:video_render',
-        '<(webrtc_root)/test/test.gyp:video_test_common',
+        '<(webrtc_root)/test/test.gyp:fake_video_frames',
         '<(webrtc_root)/test/test.gyp:test_support',
         '<(webrtc_root)/test/test.gyp:rtp_test_utils',
         '<(webrtc_root)/webrtc.gyp:webrtc',
       ],
     },
     {
       'target_name': 'webrtc_test_renderer',
       'type': 'static_library',
       'sources': [
         'gl/gl_renderer.cc',
@@ skipping 44 matching lines @@
                 '-Wno-comment',
                 '-Wno-delete-non-virtual-dtor',
               ],
             },
           },
         }],
       ],
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(webrtc_root)/modules/modules.gyp:media_file',
-        '<(webrtc_root)/test/test.gyp:video_test_common',
+        '<(webrtc_root)/test/test.gyp:fake_video_frames',
         '<(webrtc_root)/test/test.gyp:test_support',
       ],
       'direct_dependent_settings': {
         'conditions': [
           ['OS=="linux"', {
             'libraries': [
               '-lXext',
               '-lX11',
               '-lGL',
             ],
@@ skipping 33 matching lines @@
             'fake_network_pipe_unittest.cc',
             'frame_generator_unittest.cc',
             'rtp_file_reader_unittest.cc',
             'rtp_file_writer_unittest.cc',
           ],
         },
       ],  #targets
     }],  # include_tests
   ],  # conditions
 }