Reland of Make cricket::VideoFrame inherit webrtc::VideoFrame.

webrtc/media/base/testutils.h

 /*
  *  Copyright (c) 2004 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.
  */
 
@@ skipping 25 matching lines @@
 // Returns size of ARGB image.
 #define ARGB_SIZE(w, h) (w * h * 4)
 
 template <class T> inline std::vector<T> MakeVector(const T a[], size_t s) {
   return std::vector<T>(a, a + s);
 }
 #define MAKE_VECTOR(a) cricket::MakeVector(a, arraysize(a))
 
 struct RtpDumpPacket;
 class RtpDumpWriter;
-class VideoFrame;
 
 struct RawRtpPacket {
   void WriteToByteBuffer(uint32_t in_ssrc, rtc::ByteBufferWriter* buf) const;
   bool ReadFromByteBuffer(rtc::ByteBufferReader* buf);
   // Check if this packet is the same as the specified packet except the
   // sequence number and timestamp, which should be the same as the specified
   // parameters.
   bool SameExceptSeqNumTimestampSsrc(const RawRtpPacket& packet,
                                      uint16_t seq,
                                      uint32_t ts,
@@ skipping 128 matching lines @@
 // Create Simulcast stream with given |ssrcs| and |rtx_ssrcs|.
 // The number of |rtx_ssrcs| must match number of |ssrcs|.
 cricket::StreamParams CreateSimWithRtxStreamParams(
     const std::string& cname,
     const std::vector<uint32_t>& ssrcs,
     const std::vector<uint32_t>& rtx_ssrcs);
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_TESTUTILS_H_