Revert of Refactor video capturing code in the render process

content/renderer/media/media_stream_video_source_unittest.cc

Index: content/renderer/media/media_stream_video_source_unittest.cc
diff --git a/content/renderer/media/media_stream_video_source_unittest.cc b/content/renderer/media/media_stream_video_source_unittest.cc
index 1274cc53d89a1e86fca212aa7a9956162ad4fdf6..c6e4bf8418b19e5fe7f9e1314fd1d2e6c7529f06 100644
--- a/content/renderer/media/media_stream_video_source_unittest.cc
+++ b/content/renderer/media/media_stream_video_source_unittest.cc
@@ -106,7 +106,7 @@
     scoped_refptr<media::VideoFrame> frame =
         media::VideoFrame::CreateBlackFrame(gfx::Size(capture_width,
                                                       capture_height));
-    mock_source()->DeliverVideoFrame(frame, media::VideoCaptureFormat());
+    mock_source()->DeliverVideoFrame(frame);
     EXPECT_EQ(1, sink.number_of_frames());
 
     // Expect the delivered frame to be cropped.
@@ -418,8 +418,7 @@
   {
     scoped_refptr<media::VideoFrame> frame1 =
         media::VideoFrame::CreateBlackFrame(gfx::Size(320, 240));
-    mock_source()->DeliverVideoFrame(frame1,
-                                     media::VideoCaptureFormat());
+    mock_source()->DeliverVideoFrame(frame1);
   }
   EXPECT_EQ(1, sink.number_of_frames());
   // Expect the delivered frame to be passed unchanged since its smaller than
@@ -430,8 +429,7 @@
   {
     scoped_refptr<media::VideoFrame> frame2 =
           media::VideoFrame::CreateBlackFrame(gfx::Size(640, 480));
-    mock_source()->DeliverVideoFrame(frame2,
-                                     media::VideoCaptureFormat());
+    mock_source()->DeliverVideoFrame(frame2);
   }
   EXPECT_EQ(2, sink.number_of_frames());
   // Expect the delivered frame to be passed unchanged since its smaller than
@@ -442,8 +440,7 @@
   {
     scoped_refptr<media::VideoFrame> frame3 =
           media::VideoFrame::CreateBlackFrame(gfx::Size(1280, 720));
-    mock_source()->DeliverVideoFrame(frame3,
-                                     media::VideoCaptureFormat());
+    mock_source()->DeliverVideoFrame(frame3);
   }
   EXPECT_EQ(3, sink.number_of_frames());
   // Expect a frame to be cropped since its larger than max requested.