Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/content/browser/renderer_host/media/video_capture_manager_unittest.cc

Index: trunk/src/content/browser/renderer_host/media/video_capture_manager_unittest.cc
===================================================================
--- trunk/src/content/browser/renderer_host/media/video_capture_manager_unittest.cc	(revision 236934)
+++ trunk/src/content/browser/renderer_host/media/video_capture_manager_unittest.cc	(working copy)
@@ -99,21 +99,16 @@
 
   VideoCaptureControllerID StartClient(int session_id, bool expect_success) {
     media::VideoCaptureParams params;
+    params.session_id = session_id;
     params.requested_format = media::VideoCaptureFormat(
-        gfx::Size(320, 240), 30, media::PIXEL_FORMAT_I420);
+        320, 240, 30, media::ConstantResolutionVideoCaptureDevice);
 
     VideoCaptureControllerID client_id(next_client_id_++);
     base::RunLoop run_loop;
     vcm_->StartCaptureForClient(
-        session_id,
-        params,
-        base::kNullProcessHandle,
-        client_id,
-        frame_observer_.get(),
+        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;