Make cricket::VideoFrame inherit webrtc::VideoFrame.

webrtc/media/base/testutils.h

Index: webrtc/media/base/testutils.h
diff --git a/webrtc/media/base/testutils.h b/webrtc/media/base/testutils.h
index d69e10e6c0d57e8bd7599b36ec28574855ee23ac..6c500c0615c6c1a361fac584ac3423e6f5487f71 100644
--- a/webrtc/media/base/testutils.h
+++ b/webrtc/media/base/testutils.h
@@ -22,6 +22,7 @@
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videocommon.h"
+#include "webrtc/media/base/videoframe.h"
 
 namespace rtc {
 class ByteBufferReader;
@@ -43,8 +44,11 @@ template <class T> inline std::vector<T> MakeVector(const T a[], size_t s) {
 
 struct RtpDumpPacket;
 class RtpDumpWriter;
+// TODO(nisse): For some reason, forward declaration doens't work when
+// the definition is a "using" alias.
+#if 0
 class VideoFrame;
-
+#endif
 struct RawRtpPacket {
   void WriteToByteBuffer(uint32_t in_ssrc, rtc::ByteBufferWriter* buf) const;
   bool ReadFromByteBuffer(rtc::ByteBufferReader* buf);