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

webrtc/media/devices/gdivideorenderer.h

Index: webrtc/media/devices/gdivideorenderer.h
diff --git a/webrtc/media/devices/gdivideorenderer.h b/webrtc/media/devices/gdivideorenderer.h
index c88ebd7e57c3bf0cdb5b7aec1ae51e570763a381..eaf49ca26b5a6062797a6d97aa8e6f41262d1ecc 100644
--- a/webrtc/media/devices/gdivideorenderer.h
+++ b/webrtc/media/devices/gdivideorenderer.h
@@ -18,12 +18,13 @@
 
 #include <memory>
 
+// 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"
 
 namespace cricket {
 
-class VideoFrame;
-
 class GdiVideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> {
  public:
   GdiVideoRenderer(int x, int y);