Reland of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame.

webrtc/examples/peerconnection/client/linux/main_wnd.cc

Index: webrtc/examples/peerconnection/client/linux/main_wnd.cc
diff --git a/webrtc/examples/peerconnection/client/linux/main_wnd.cc b/webrtc/examples/peerconnection/client/linux/main_wnd.cc
index eda66178265b72eb8bc23adebcd760b01bdf91d1..8d7d11ac153727d1489ebfe43e2381ff20885975 100644
--- a/webrtc/examples/peerconnection/client/linux/main_wnd.cc
+++ b/webrtc/examples/peerconnection/client/linux/main_wnd.cc
@@ -19,7 +19,6 @@
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringutils.h"
-#include "webrtc/media/engine/webrtcvideoframe.h"
 
 using rtc::sprintfn;
 
@@ -483,18 +482,15 @@ void GtkMainWnd::VideoRenderer::SetSize(int width, int height) {
 }
 
 void GtkMainWnd::VideoRenderer::OnFrame(
-    const cricket::VideoFrame& video_frame) {
+    const webrtc::VideoFrame& video_frame) {
   gdk_threads_enter();
 
-  const cricket::WebRtcVideoFrame frame(
+  rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
       webrtc::I420Buffer::Rotate(video_frame.video_frame_buffer(),
-                                 video_frame.rotation()),
-      webrtc::kVideoRotation_0, video_frame.timestamp_us());
+                                 video_frame.rotation()));
 
-  SetSize(frame.width(), frame.height());
+  SetSize(buffer->width(), buffer->height());
 
-  rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
-      frame.video_frame_buffer());
   libyuv::I420ToRGBA(buffer->DataY(), buffer->StrideY(),
                      buffer->DataU(), buffer->StrideU(),
                      buffer->DataV(), buffer->StrideV(),