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

webrtc/media/base/videobroadcaster.cc

Index: webrtc/media/base/videobroadcaster.cc
diff --git a/webrtc/media/base/videobroadcaster.cc b/webrtc/media/base/videobroadcaster.cc
index d3bc7a09cebccdcfccb839cda8e1dcd6d8aeadb7..653829639c47cafd4960aa8dfb2e18e2bd46e17e 100644
--- a/webrtc/media/base/videobroadcaster.cc
+++ b/webrtc/media/base/videobroadcaster.cc
@@ -13,6 +13,7 @@
 #include <limits>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 
 namespace rtc {
 
@@ -64,7 +65,7 @@ void VideoBroadcaster::OnFrame(const cricket::VideoFrame& frame) {
     if (sink_pair.wants.black_frames) {
       sink_pair.sink->OnFrame(cricket::WebRtcVideoFrame(
           GetBlackFrameBuffer(frame.width(), frame.height()), frame.rotation(),
-          frame.timestamp_us(), frame.transport_frame_id()));
+          frame.timestamp_us()));
     } else {
       sink_pair.sink->OnFrame(frame);
     }