Reland: Reorganize media::VideoCapture* types

content/renderer/media/rtc_video_capturer.cc

Index: content/renderer/media/rtc_video_capturer.cc
diff --git a/content/renderer/media/rtc_video_capturer.cc b/content/renderer/media/rtc_video_capturer.cc
index 2cf0d917b4fd742d8d07bfdb259b1a374dc852e9..0a7a82cf5880b26b419a0de7266e19876b2db51d 100644
--- a/content/renderer/media/rtc_video_capturer.cc
+++ b/content/renderer/media/rtc_video_capturer.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
+#include "media/base/video_frame.h"
 
 namespace content {
 
@@ -30,11 +31,10 @@ cricket::CaptureState RtcVideoCapturer::Start(
   }
 
   media::VideoCaptureParams request;
-  request.requested_format =
-      media::VideoCaptureFormat(capture_format.width,
-                                capture_format.height,
-                                capture_format.framerate(),
-                                media::ConstantResolutionVideoCaptureDevice);
+  request.requested_format = media::VideoCaptureFormat(
+      gfx::Size(capture_format.width, capture_format.height),
+      capture_format.framerate(),
+      media::PIXEL_FORMAT_I420);
 
   SetCaptureFormat(&capture_format);