Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/content/renderer/media/video_capture_impl_unittest.cc

Index: trunk/src/content/renderer/media/video_capture_impl_unittest.cc
===================================================================
--- trunk/src/content/renderer/media/video_capture_impl_unittest.cc	(revision 236934)
+++ trunk/src/content/renderer/media/video_capture_impl_unittest.cc	(working copy)
@@ -81,7 +81,6 @@
     }
 
     void DeviceStartCapture(int device_id,
-                            media::VideoCaptureSessionId session_id,
                             const media::VideoCaptureParams& params) {
       OnStateChanged(VIDEO_CAPTURE_STATE_STARTED);
     }
@@ -97,10 +96,10 @@
 
   VideoCaptureImplTest() {
     params_small_.requested_format = media::VideoCaptureFormat(
-        gfx::Size(176, 144), 30, media::PIXEL_FORMAT_I420);
+        176, 144, 30, media::ConstantResolutionVideoCaptureDevice);
 
     params_large_.requested_format = media::VideoCaptureFormat(
-        gfx::Size(320, 240), 30, media::PIXEL_FORMAT_I420);
+        320, 240, 30, media::ConstantResolutionVideoCaptureDevice);
 
     message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_IO));
     message_loop_proxy_ = base::MessageLoopProxy::current().get();