Reland: Reorganize media::VideoCapture* types

content/browser/renderer_host/media/video_capture_manager_unittest.cc

Index: content/browser/renderer_host/media/video_capture_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index a986e0bc3702eca982798687eb0dbc9f17821b82..e4d3bb227d5770495d3d3a5877fc8df9c196f884 100644
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -99,16 +99,21 @@ class VideoCaptureManagerTest : public testing::Test {
 
   VideoCaptureControllerID StartClient(int session_id, bool expect_success) {
     media::VideoCaptureParams params;
-    params.session_id = session_id;
     params.requested_format = media::VideoCaptureFormat(
-        320, 240, 30, media::ConstantResolutionVideoCaptureDevice);
+        gfx::Size(320, 240), 30, media::PIXEL_FORMAT_I420);
 
     VideoCaptureControllerID client_id(next_client_id_++);
     base::RunLoop run_loop;
     vcm_->StartCaptureForClient(
-        params, base::kNullProcessHandle, client_id, frame_observer_.get(),
+        session_id,
+        params,
+        base::kNullProcessHandle,
+        client_id,
+        frame_observer_.get(),
         base::Bind(&VideoCaptureManagerTest::OnGotControllerCallback,
-                   base::Unretained(this), client_id, run_loop.QuitClosure(),
+                   base::Unretained(this),
+                   client_id,
+                   run_loop.QuitClosure(),
                    expect_success));
     run_loop.Run();
     return client_id;