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

webrtc/media/base/videobroadcaster_unittest.cc

 /*
  *  Copyright 2016 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 122 matching lines @@
   VideoSinkWants wants2;
   wants2.black_frames = false;
   broadcaster.AddOrUpdateSink(&sink2, wants2);
 
   rtc::scoped_refptr<webrtc::I420Buffer> buffer(
       new rtc::RefCountedObject<webrtc::I420Buffer>(100, 200));
   // Makes it not all black.
   buffer->InitializeData();
 
   cricket::WebRtcVideoFrame frame1(buffer, webrtc::kVideoRotation_0,
-                                   10 /* timestamp_us */, 0 /* frame_id */);
+                                   10 /* timestamp_us */);
   broadcaster.OnFrame(frame1);
   EXPECT_TRUE(sink1.black_frame());
   EXPECT_EQ(10, sink1.timestamp_us());
   EXPECT_FALSE(sink2.black_frame());
   EXPECT_EQ(10, sink2.timestamp_us());
 
   // Switch the sink wants.
   wants1.black_frames = false;
   broadcaster.AddOrUpdateSink(&sink1, wants1);
   wants2.black_frames = true;
   broadcaster.AddOrUpdateSink(&sink2, wants2);
 
   cricket::WebRtcVideoFrame frame2(buffer, webrtc::kVideoRotation_0,
-                                   30 /* timestamp_us */, 0 /* frame_id */);
+                                   30 /* timestamp_us */);
   broadcaster.OnFrame(frame2);
   EXPECT_FALSE(sink1.black_frame());
   EXPECT_EQ(30, sink1.timestamp_us());
   EXPECT_TRUE(sink2.black_frame());
   EXPECT_EQ(30, sink2.timestamp_us());
 }