Make cricket::VideoFrame inherit webrtc::VideoFrame.

webrtc/media/base/videoframe.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.
  */
 
 #ifndef WEBRTC_MEDIA_BASE_VIDEOFRAME_H_
 #define WEBRTC_MEDIA_BASE_VIDEOFRAME_H_
 
+#include "webrtc/video_frame.h"
+
+#if 0
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/stream.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
 #include "webrtc/common_video/rotation.h"
+#endif
 
 namespace cricket {
 
+using VideoFrame = webrtc::VideoFrame;
+#if 0
 // Represents a YUV420 (a.k.a. I420) video frame.
 
 // TODO(nisse): This class duplicates webrtc::VideoFrame. There's
 // ongoing work to merge the classes. See
 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5682.
 class VideoFrame {
  public:
   VideoFrame() {}
   virtual ~VideoFrame() {}
 
@@ skipping 29 matching lines @@
   // TODO(nisse): Deprecated. Should be deleted in the cricket::VideoFrame and
   // webrtc::VideoFrame merge. Validation of sample_size possibly moved to
   // libyuv::ConvertToI420. As an initial step, demote this method to protected
   // status. Used only by WebRtcVideoFrame::Reset.
   static bool Validate(uint32_t fourcc,
                        int w,
                        int h,
                        const uint8_t* sample,
                        size_t sample_size);
 };
+#endif
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOFRAME_H_