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

webrtc/media/devices/gtkvideorenderer.cc

Index: webrtc/media/devices/gtkvideorenderer.cc
diff --git a/webrtc/media/devices/gtkvideorenderer.cc b/webrtc/media/devices/gtkvideorenderer.cc
index 91fa933e0d62bf03856971d532e093e2fbc60cf7..b88c391cafa6f351587abca3113e5af04db6b7bb 100644
--- a/webrtc/media/devices/gtkvideorenderer.cc
+++ b/webrtc/media/devices/gtkvideorenderer.cc
@@ -11,13 +11,13 @@
 // Implementation of GtkVideoRenderer
 
 #include "webrtc/media/devices/gtkvideorenderer.h"
+#include "webrtc/video_frame.h"
 
 #include <gdk/gdk.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 
 #include "libyuv/convert_argb.h"
-#include "webrtc/media/engine/webrtcvideoframe.h"
 
 namespace cricket {
 
@@ -80,24 +80,21 @@ bool GtkVideoRenderer::SetSize(int width, int height) {
   return true;
 }
 
-void GtkVideoRenderer::OnFrame(const VideoFrame& video_frame) {
-  const cricket::WebRtcVideoFrame frame(
+void GtkVideoRenderer::OnFrame(const webrtc::VideoFrame& video_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()));
 
   // Need to set size as the frame might be rotated.
-  if (!SetSize(frame.width(), frame.height())) {
+  if (!SetSize(buffer->width(), buffer->height())) {
     return;
   }
 
   // convert I420 frame to ABGR format, which is accepted by GTK
-  rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
-      frame.video_frame_buffer());
   libyuv::I420ToARGB(buffer->DataY(), buffer->StrideY(),
                      buffer->DataU(), buffer->StrideU(),
                      buffer->DataV(), buffer->StrideV(),
-                     image_.get(), frame.width() * 4,
+                     image_.get(), buffer->width() * 4,
                      buffer->width(), buffer->height());
 
   ScopedGdkLock lock;
@@ -111,11 +108,11 @@ void GtkVideoRenderer::OnFrame(const VideoFrame& video_frame) {
                         draw_area_->style->fg_gc[GTK_STATE_NORMAL],
                         0,
                         0,
-                        frame.width(),
-                        frame.height(),
+                        buffer->width(),
+                        buffer->height(),
                         GDK_RGB_DITHER_MAX,
                         image_.get(),
-                        frame.width() * 4);
+                        buffer->width() * 4);
 
   // Run the Gtk main loop to refresh the window.
   Pump();