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

webrtc/media/devices/gtkvideorenderer.h

Index: webrtc/media/devices/gtkvideorenderer.h
diff --git a/webrtc/media/devices/gtkvideorenderer.h b/webrtc/media/devices/gtkvideorenderer.h
index 750a5bb8d5eac311b4235e52cf5034f8f005ddaf..7834f1bcf65cb68ba1a76c831e973ff0c4a704b7 100644
--- a/webrtc/media/devices/gtkvideorenderer.h
+++ b/webrtc/media/devices/gtkvideorenderer.h
@@ -17,14 +17,15 @@
 #include <memory>
 
 #include "webrtc/base/basictypes.h"
+// TODO(nisse): Temporarily; to be replaced with a forward declaration
+// of webrtc::VideoFrame when dependency on cricket::VideoFrame is deleted.
+#include "webrtc/media/base/videoframe.h"
 #include "webrtc/media/base/videosinkinterface.h"
 
 typedef struct _GtkWidget GtkWidget;  // forward declaration, defined in gtk.h
 
 namespace cricket {
 
-class VideoFrame;
-
 class GtkVideoRenderer : public rtc::VideoSinkInterface<VideoFrame> {
  public:
   GtkVideoRenderer(int x, int y);